r23077 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in patches/070_mandatory-relibtoolize.patch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Thu Feb 18 16:57:36 UTC 2010
Author: pochu
Date: Thu Feb 18 16:57:34 2010
New Revision: 23077
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23077
Log:
* New upstream bugfix release.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Updated for the new version.
* debian/control.in:
+ Standards-Version is 3.8.4, no changes needed.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/control
desktop/unstable/gtk+2.0/debian/control.in
desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=23077&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Thu Feb 18 16:57:34 2010
@@ -1,3 +1,13 @@
+gtk+2.0 (2.18.7-1) UNRELEASED; urgency=low
+
+ * New upstream bugfix release.
+ + debian/patches/070_mandatory-relibtoolize.patch:
+ - Updated for the new version.
+ * debian/control.in:
+ + Standards-Version is 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 18 Feb 2010 12:57:29 +0100
+
gtk+2.0 (2.18.6-1) unstable; urgency=low
* New upstream bugfix release:
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=23077&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Thu Feb 18 16:57:34 2010
@@ -42,7 +42,7 @@
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: libgtk2.0-0
Architecture: any
Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=23077&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Thu Feb 18 16:57:34 2010
@@ -42,7 +42,7 @@
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: @SHARED_PKG@
Architecture: any
Modified: desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=23077&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Thu Feb 18 16:57:34 2010
@@ -1,12 +1,5 @@
-diff -Naur gtk+2.0-2.18.6.old/aclocal.m4 gtk+2.0-2.18.6/aclocal.m4
---- gtk+2.0-2.18.6.old/aclocal.m4 2010-01-11 22:11:20.000000000 +0100
-+++ gtk+2.0-2.18.6/aclocal.m4 2010-01-15 10:40:24.515815647 +0100
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -18,18 +11,18 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -114,9 +114,8 @@
+@@ -114,8 +114,9 @@
{
int major, minor, micro;
char *tmp_version;
-- int ignored;
-
-- ignored = system ("touch conf.glibtest");
-+ fclose (fopen ("conf.glibtest", "w"));
++ int ignored;
+
+- fclose (fopen ("conf.glibtest", "w"));
++ ignored = system ("touch conf.glibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
-@@ -3168,7 +3167,7 @@
+@@ -3167,7 +3168,7 @@
;;
# This must be Linux ELF.
@@ -38,7 +31,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3193,13 +3192,10 @@
+@@ -3192,13 +3193,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -53,7 +46,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3211,6 +3207,18 @@
+@@ -3210,6 +3208,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -72,7 +65,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3798,11 +3806,11 @@
+@@ -3797,11 +3807,11 @@
;;
# This must be Linux ELF.
@@ -86,7 +79,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
-@@ -4419,7 +4427,7 @@
+@@ -4418,7 +4428,7 @@
;;
esac
;;
@@ -95,7 +88,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -4483,7 +4491,7 @@
+@@ -4482,7 +4492,7 @@
;;
esac
;;
@@ -104,7 +97,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4703,7 +4711,7 @@
+@@ -4702,7 +4712,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -113,7 +106,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -4908,6 +4916,9 @@
+@@ -4907,6 +4917,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$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'
;;
@@ -123,7 +116,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4972,6 +4983,9 @@
+@@ -4971,6 +4984,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -133,7 +126,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4993,6 +5007,7 @@
+@@ -4992,6 +5008,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -141,7 +134,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 ...
-@@ -5084,7 +5099,7 @@
+@@ -5083,7 +5100,7 @@
_LT_TAGVAR(archive_expsym_cmds, $1)='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'
;;
@@ -150,7 +143,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -5154,7 +5169,7 @@
+@@ -5153,7 +5170,7 @@
fi
;;
@@ -159,7 +152,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5329,6 +5344,7 @@
+@@ -5328,6 +5345,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -167,7 +160,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5567,7 +5583,7 @@
+@@ -5566,7 +5584,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -176,7 +169,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6563,7 +6579,7 @@
+@@ -6562,7 +6580,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -185,7 +178,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -8744,14 +8760,16 @@
+@@ -8743,14 +8761,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -210,7 +203,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -8795,9 +8813,9 @@
+@@ -8794,9 +8814,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -222,51 +215,8 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -8847,7 +8865,7 @@
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11.1], [],
-+m4_if([$1], [1.11], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -8863,7 +8881,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11.1])dnl
-+[AM_AUTOMAKE_VERSION([1.11])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff -Naur gtk+2.0-2.18.6.old/compile gtk+2.0-2.18.6/compile
---- gtk+2.0-2.18.6.old/compile 2009-12-10 16:29:51.000000000 +0100
-+++ gtk+2.0-2.18.6/compile 2010-01-15 10:40:29.027816056 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
-
--scriptversion=2009-10-06.20; # UTC
-+scriptversion=2009-04-28.21; # UTC
-
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
- # Foundation, Inc.
-@@ -124,9 +124,9 @@
- ret=$?
-
- if test -f "$cofile"; then
-- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-+ mv "$cofile" "$ofile"
- elif test -f "${cofile}bj"; then
-- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-+ mv "${cofile}bj" "$ofile"
- fi
-
- rmdir "$lockdir"
-diff -Naur gtk+2.0-2.18.6.old/config.h.in gtk+2.0-2.18.6/config.h.in
---- gtk+2.0-2.18.6.old/config.h.in 2010-01-11 22:11:23.000000000 +0100
-+++ gtk+2.0-2.18.6/config.h.in 2010-01-15 10:40:27.899815635 +0100
+--- a/config.h.in
++++ b/config.h.in
@@ -126,6 +126,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
@@ -287,14 +237,13 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur gtk+2.0-2.18.6.old/configure gtk+2.0-2.18.6/configure
---- gtk+2.0-2.18.6.old/configure 2010-01-11 22:11:33.000000000 +0100
-+++ gtk+2.0-2.18.6/configure 2010-01-15 10:40:26.535814417 +0100
+--- a/configure
++++ b/configure
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gtk+ 2.18.6.
-+# Generated by GNU Autoconf 2.65 for gtk+ 2.18.6.
+-# Generated by GNU Autoconf 2.63 for gtk+ 2.18.7.
++# Generated by GNU Autoconf 2.65 for gtk+ 2.18.7.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -1100,8 +1049,8 @@
# Identity of this package.
PACKAGE_NAME='gtk+'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.18.6'
- PACKAGE_STRING='gtk+ 2.18.6'
+ PACKAGE_VERSION='2.18.7'
+ PACKAGE_STRING='gtk+ 2.18.7'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
+PACKAGE_URL=''
@@ -1132,7 +1081,7 @@
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-@@ -1150,6 +1112,7 @@
+@@ -1151,6 +1113,7 @@
program_transform_name
prefix
exec_prefix
@@ -1140,7 +1089,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1330,8 +1293,7 @@
+@@ -1331,8 +1294,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 &&
@@ -1150,7 +1099,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1357,8 +1319,7 @@
+@@ -1358,8 +1320,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 &&
@@ -1160,7 +1109,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1562,8 +1523,7 @@
+@@ -1563,8 +1524,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 &&
@@ -1170,7 +1119,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1579,8 +1539,7 @@
+@@ -1580,8 +1540,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 &&
@@ -1180,7 +1129,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1610,17 +1569,17 @@
+@@ -1611,17 +1570,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1204,7 +1153,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1637,15 +1596,13 @@
+@@ -1638,15 +1597,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1222,7 +1171,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1668,8 +1625,7 @@
+@@ -1669,8 +1626,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1232,7 +1181,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1699,11 +1655,9 @@
+@@ -1700,11 +1656,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1246,7 +1195,7 @@
# Find the source files, if location was not specified.
-@@ -1742,13 +1696,11 @@
+@@ -1743,13 +1697,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1262,7 +1211,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1891,9 +1843,9 @@
+@@ -1892,9 +1844,9 @@
--enable-test-print-backend
build test print backend
@@ -1275,7 +1224,7 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1923,7 +1875,7 @@
+@@ -1924,7 +1876,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>
@@ -1284,10 +1233,10 @@
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
-@@ -2013,470 +1965,979 @@
+@@ -2014,470 +1966,979 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.18.6
+ gtk+ configure 2.18.7
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1303,7 +1252,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.18.6, which was
+-It was created by gtk+ $as_me 2.18.7, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -2139,7 +2088,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.18.6, which was
++It was created by gtk+ $as_me 2.18.7, which was
+generated by GNU Autoconf 2.65. Invocation command line was
+ $ $0 $@
@@ -2646,7 +2595,7 @@
# program-specific install script used by HP pwplus--don't use.
:
else
-@@ -2499,7 +2960,7 @@
+@@ -2500,7 +2961,7 @@
;;
esac
@@ -2655,7 +2604,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2515,7 +2976,7 @@
+@@ -2516,7 +2977,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2664,7 +2613,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2526,7 +2987,7 @@
+@@ -2527,7 +2988,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2673,7 +2622,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2537,15 +2998,11 @@
+@@ -2538,15 +2999,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2691,7 +2640,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2567,11 +3024,8 @@
+@@ -2568,11 +3025,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".
@@ -2705,7 +2654,7 @@
fi
test "$2" = conftest.file
-@@ -2580,13 +3034,10 @@
+@@ -2581,13 +3035,10 @@
# Ok.
:
else
@@ -2722,7 +2671,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2614,7 +3065,7 @@
+@@ -2615,7 +3066,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2731,7 +2680,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2635,9 +3086,9 @@
+@@ -2636,9 +3087,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
@@ -2743,7 +2692,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2648,24 +3099,24 @@
+@@ -2649,24 +3100,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2773,7 +2722,7 @@
$as_echo "no" >&6; }
fi
-@@ -2675,9 +3126,9 @@
+@@ -2676,9 +3127,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
@@ -2785,7 +2734,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2688,24 +3139,24 @@
+@@ -2689,24 +3140,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2815,7 +2764,7 @@
$as_echo "no" >&6; }
fi
-@@ -2714,7 +3165,7 @@
+@@ -2715,7 +3166,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2824,7 +2773,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2727,10 +3178,10 @@
+@@ -2728,10 +3179,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2837,7 +2786,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2738,7 +3189,7 @@
+@@ -2739,7 +3190,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2846,7 +2795,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 #(
-@@ -2750,11 +3201,12 @@
+@@ -2751,11 +3202,12 @@
esac
done
done
@@ -2860,7 +2809,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2762,11 +3214,10 @@
+@@ -2763,11 +3215,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.
@@ -2873,7 +2822,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2779,9 +3230,9 @@
+@@ -2780,9 +3231,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
@@ -2885,7 +2834,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2792,24 +3243,24 @@
+@@ -2793,24 +3244,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2915,7 +2864,7 @@
$as_echo "no" >&6; }
fi
-@@ -2817,11 +3268,11 @@
+@@ -2818,11 +3269,11 @@
test -n "$AWK" && break
done
@@ -2929,7 +2878,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2839,11 +3290,11 @@
+@@ -2840,11 +3291,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2943,7 +2892,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2863,9 +3314,7 @@
+@@ -2864,9 +3315,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2954,7 +2903,7 @@
fi
fi
-@@ -2919,7 +3368,7 @@
+@@ -2920,7 +3369,7 @@
# by either passing --enable-silent-rules to configure or passing V=0
# to make
# Check whether --enable-silent-rules was given.
@@ -2963,7 +2912,7 @@
enableval=$enable_silent_rules;
fi
-@@ -3008,35 +3457,27 @@
+@@ -3009,35 +3458,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3006,7 +2955,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3052,28 +3493,24 @@
+@@ -3053,28 +3494,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -3040,7 +2989,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3091,7 +3528,7 @@
+@@ -3092,7 +3529,7 @@
MATH_LIB=-lm
@@ -3048,8 +2997,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
-@@ -3109,7 +3546,7 @@
+ EXE_MANIFEST_ARCHITECTURE=X86
+@@ -3112,7 +3549,7 @@
os_win32=no
;;
esac
@@ -3058,7 +3007,7 @@
$as_echo "$os_win32" >&6; }
-@@ -3128,9 +3565,9 @@
+@@ -3132,9 +3569,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
@@ -3070,7 +3019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3141,24 +3578,24 @@
+@@ -3145,24 +3582,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3100,7 +3049,7 @@
$as_echo "no" >&6; }
fi
-@@ -3168,9 +3605,9 @@
+@@ -3172,9 +3609,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
@@ -3112,7 +3061,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3181,24 +3618,24 @@
+@@ -3185,24 +3622,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3142,7 +3091,7 @@
$as_echo "no" >&6; }
fi
-@@ -3207,7 +3644,7 @@
+@@ -3211,7 +3648,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3151,7 +3100,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3221,9 +3658,9 @@
+@@ -3225,9 +3662,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
@@ -3163,7 +3112,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3234,24 +3671,24 @@
+@@ -3238,24 +3675,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3193,7 +3142,7 @@
$as_echo "no" >&6; }
fi
-@@ -3261,9 +3698,9 @@
+@@ -3265,9 +3702,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
@@ -3205,7 +3154,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3275,18 +3712,18 @@
+@@ -3279,18 +3716,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3227,7 +3176,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3305,10 +3742,10 @@
+@@ -3309,10 +3746,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3240,7 +3189,7 @@
$as_echo "no" >&6; }
fi
-@@ -3320,9 +3757,9 @@
+@@ -3324,9 +3761,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
@@ -3252,7 +3201,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3333,24 +3770,24 @@
+@@ -3337,24 +3774,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3282,7 +3231,7 @@
$as_echo "no" >&6; }
fi
-@@ -3364,9 +3801,9 @@
+@@ -3368,9 +3805,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
@@ -3294,7 +3243,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3377,24 +3814,24 @@
+@@ -3381,24 +3818,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3324,7 +3273,7 @@
$as_echo "no" >&6; }
fi
-@@ -3407,7 +3844,7 @@
+@@ -3411,7 +3848,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3333,7 +3282,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3418,57 +3855,37 @@
+@@ -3422,57 +3859,37 @@
fi
@@ -3411,7 +3360,7 @@
/* end confdefs.h. */
int
-@@ -3484,8 +3901,8 @@
+@@ -3488,8 +3905,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.
@@ -3422,7 +3371,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3501,17 +3918,17 @@
+@@ -3505,17 +3922,17 @@
done
rm -f $ac_rmfiles
@@ -3445,7 +3394,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,
-@@ -3528,7 +3945,7 @@
+@@ -3532,7 +3949,7 @@
# certainly right.
break;;
*.* )
@@ -3454,7 +3403,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3547,84 +3964,42 @@
+@@ -3551,84 +3968,42 @@
else
ac_file=''
fi
@@ -3560,7 +3509,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
-@@ -3639,135 +4014,157 @@
+@@ -3643,135 +4018,157 @@
esac
done
else
@@ -3799,7 +3748,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3776,20 +4173,16 @@
+@@ -3780,20 +4177,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3823,7 +3772,7 @@
/* end confdefs.h. */
int
-@@ -3800,35 +4193,11 @@
+@@ -3804,35 +4197,11 @@
return 0;
}
_ACEOF
@@ -3862,7 +3811,7 @@
/* end confdefs.h. */
int
-@@ -3839,36 +4208,12 @@
+@@ -3843,36 +4212,12 @@
return 0;
}
_ACEOF
@@ -3903,7 +3852,7 @@
/* end confdefs.h. */
int
-@@ -3879,42 +4224,17 @@
+@@ -3883,42 +4228,17 @@
return 0;
}
_ACEOF
@@ -3948,7 +3897,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3931,18 +4251,14 @@
+@@ -3935,18 +4255,14 @@
CFLAGS=
fi
fi
@@ -3970,7 +3919,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3999,32 +4315,9 @@
+@@ -4003,32 +4319,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -4004,7 +3953,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4035,17 +4328,19 @@
+@@ -4039,17 +4332,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -4027,7 +3976,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4064,7 +4359,7 @@
+@@ -4068,7 +4363,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -4036,7 +3985,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -4092,12 +4387,12 @@
+@@ -4096,12 +4391,12 @@
fi
@@ -4051,7 +4000,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -4117,9 +4412,9 @@
+@@ -4121,9 +4416,9 @@
depcc="$CC" am_compiler_list=
@@ -4063,7 +4012,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4227,7 +4522,7 @@
+@@ -4231,7 +4526,7 @@
fi
fi
@@ -4072,7 +4021,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4243,7 +4538,7 @@
+@@ -4247,7 +4542,7 @@
# Check whether --enable-static was given.
@@ -4081,7 +4030,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -4273,15 +4568,23 @@
+@@ -4277,15 +4572,23 @@
@@ -4107,7 +4056,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -4292,24 +4595,24 @@
+@@ -4296,24 +4599,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4137,7 +4086,7 @@
$as_echo "no" >&6; }
fi
-@@ -4323,9 +4626,9 @@
+@@ -4327,9 +4630,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
@@ -4149,7 +4098,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -4336,24 +4639,24 @@
+@@ -4340,24 +4643,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4179,7 +4128,7 @@
$as_echo "no" >&6; }
fi
-@@ -4366,7 +4669,7 @@
+@@ -4370,7 +4673,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4188,7 +4137,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4396,9 +4699,9 @@
+@@ -4400,9 +4703,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
@@ -4200,7 +4149,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -4409,24 +4712,24 @@
+@@ -4413,24 +4716,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4230,7 +4179,7 @@
$as_echo "no" >&6; }
fi
-@@ -4440,9 +4743,9 @@
+@@ -4444,9 +4747,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
@@ -4242,7 +4191,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -4453,24 +4756,24 @@
+@@ -4457,24 +4760,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4272,7 +4221,7 @@
$as_echo "no" >&6; }
fi
-@@ -4483,7 +4786,7 @@
+@@ -4487,7 +4790,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4281,7 +4230,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4494,53 +4797,36 @@
+@@ -4498,53 +4801,36 @@
fi
fi
# Provide some information about the compiler.
@@ -4354,7 +4303,7 @@
/* end confdefs.h. */
int
-@@ -4554,37 +4840,16 @@
+@@ -4558,37 +4844,16 @@
return 0;
}
_ACEOF
@@ -4395,7 +4344,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -4593,20 +4858,16 @@
+@@ -4597,20 +4862,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -4419,7 +4368,7 @@
/* end confdefs.h. */
int
-@@ -4617,35 +4878,11 @@
+@@ -4621,35 +4882,11 @@
return 0;
}
_ACEOF
@@ -4458,7 +4407,7 @@
/* end confdefs.h. */
int
-@@ -4656,36 +4893,12 @@
+@@ -4660,36 +4897,12 @@
return 0;
}
_ACEOF
@@ -4499,7 +4448,7 @@
/* end confdefs.h. */
int
-@@ -4696,42 +4909,17 @@
+@@ -4700,42 +4913,17 @@
return 0;
}
_ACEOF
@@ -4544,7 +4493,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -4756,9 +4944,9 @@
+@@ -4760,9 +4948,9 @@
depcc="$CXX" am_compiler_list=
@@ -4556,7 +4505,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4866,7 +5054,7 @@
+@@ -4870,7 +5058,7 @@
fi
fi
@@ -4565,7 +4514,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4882,11 +5070,7 @@
+@@ -4886,11 +5074,7 @@
@@ -4578,7 +4527,7 @@
/* end confdefs.h. */
int
-@@ -4897,32 +5081,11 @@
+@@ -4901,32 +5085,11 @@
return 0;
}
_ACEOF
@@ -4614,7 +4563,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$CXX" != ""; then
HAVE_CXX_TRUE=
-@@ -4935,11 +5098,7 @@
+@@ -4939,11 +5102,7 @@
gtk_save_cxxflags="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -x objective-c++"
@@ -4627,7 +4576,7 @@
/* end confdefs.h. */
@interface Foo @end
int
-@@ -4950,32 +5109,11 @@
+@@ -4954,32 +5113,11 @@
return 0;
}
_ACEOF
@@ -4662,7 +4611,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$OBJC" = "yes"; then
HAVE_OBJC_TRUE=
-@@ -4995,12 +5133,12 @@
+@@ -4999,12 +5137,12 @@
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
@@ -4677,7 +4626,7 @@
$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
fi
enable_shared=yes
-@@ -5013,9 +5151,9 @@
+@@ -5017,9 +5155,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
@@ -4689,7 +4638,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -5026,24 +5164,24 @@
+@@ -5030,24 +5168,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4719,7 +4668,7 @@
$as_echo "no" >&6; }
fi
-@@ -5053,9 +5191,9 @@
+@@ -5057,9 +5195,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
@@ -4731,7 +4680,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -5066,24 +5204,24 @@
+@@ -5070,24 +5208,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4761,7 +4710,7 @@
$as_echo "no" >&6; }
fi
-@@ -5092,7 +5230,7 @@
+@@ -5096,7 +5234,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4770,7 +4719,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5105,9 +5243,9 @@
+@@ -5109,9 +5247,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
@@ -4782,7 +4731,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -5118,24 +5256,24 @@
+@@ -5122,24 +5260,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4812,7 +4761,7 @@
$as_echo "no" >&6; }
fi
-@@ -5145,9 +5283,9 @@
+@@ -5149,9 +5287,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
@@ -4824,7 +4773,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -5158,24 +5296,24 @@
+@@ -5162,24 +5300,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4854,7 +4803,7 @@
$as_echo "no" >&6; }
fi
-@@ -5184,7 +5322,7 @@
+@@ -5188,7 +5326,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4863,7 +4812,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5197,9 +5335,9 @@
+@@ -5201,9 +5339,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
@@ -4875,7 +4824,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5210,24 +5348,24 @@
+@@ -5214,24 +5352,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4905,7 +4854,7 @@
$as_echo "no" >&6; }
fi
-@@ -5237,9 +5375,9 @@
+@@ -5241,9 +5379,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
@@ -4917,7 +4866,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5250,24 +5388,24 @@
+@@ -5254,24 +5392,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4947,7 +4896,7 @@
$as_echo "no" >&6; }
fi
-@@ -5276,7 +5414,7 @@
+@@ -5280,7 +5418,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4956,7 +4905,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5311,7 +5449,7 @@
+@@ -5315,7 +5453,7 @@
case `pwd` in
*\ * | *\ *)
@@ -4965,7 +4914,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -5334,9 +5472,9 @@
+@@ -5338,9 +5476,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -4977,7 +4926,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5344,7 +5482,7 @@
+@@ -5348,7 +5486,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -4986,7 +4935,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5353,7 +5491,7 @@
+@@ -5357,7 +5495,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4995,7 +4944,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
-@@ -5373,7 +5511,7 @@
+@@ -5377,7 +5515,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
@@ -5004,7 +4953,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"
-@@ -5388,19 +5526,17 @@
+@@ -5392,19 +5530,17 @@
$ac_path_SED_found && break 3
done
done
@@ -5027,7 +4976,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -5418,9 +5554,9 @@
+@@ -5422,9 +5558,9 @@
@@ -5039,7 +4988,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5431,7 +5567,7 @@
+@@ -5435,7 +5571,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5048,7 +4997,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
-@@ -5451,7 +5587,7 @@
+@@ -5455,7 +5591,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
@@ -5057,7 +5006,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"
-@@ -5466,26 +5602,24 @@
+@@ -5470,26 +5606,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -5089,7 +5038,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5499,7 +5633,7 @@
+@@ -5503,7 +5637,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5098,7 +5047,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
-@@ -5519,7 +5653,7 @@
+@@ -5523,7 +5657,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
@@ -5107,7 +5056,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"
-@@ -5534,12 +5668,10 @@
+@@ -5538,12 +5672,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -5122,7 +5071,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5547,14 +5679,14 @@
+@@ -5551,14 +5683,14 @@
fi
fi
@@ -5140,7 +5089,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5568,7 +5700,7 @@
+@@ -5572,7 +5704,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5149,7 +5098,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
-@@ -5588,7 +5720,7 @@
+@@ -5592,7 +5724,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
@@ -5158,7 +5107,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"
-@@ -5603,12 +5735,10 @@
+@@ -5607,12 +5739,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -5173,7 +5122,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5616,7 +5746,7 @@
+@@ -5620,7 +5750,7 @@
fi
fi
@@ -5182,7 +5131,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -5642,7 +5772,7 @@
+@@ -5646,7 +5776,7 @@
# Check whether --with-gnu-ld was given.
@@ -5191,7 +5140,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -5651,7 +5781,7 @@
+@@ -5655,7 +5785,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -5200,7 +5149,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -5681,13 +5811,13 @@
+@@ -5685,13 +5815,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -5217,7 +5166,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -5718,18 +5848,16 @@
+@@ -5722,18 +5852,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -5241,7 +5190,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5742,7 +5870,7 @@
+@@ -5746,7 +5874,7 @@
;;
esac
fi
@@ -5250,7 +5199,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -5754,9 +5882,9 @@
+@@ -5758,9 +5886,9 @@
@@ -5262,7 +5211,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5803,7 +5931,7 @@
+@@ -5807,7 +5935,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -5271,7 +5220,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -5814,9 +5942,9 @@
+@@ -5818,9 +5946,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
@@ -5283,7 +5232,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5827,24 +5955,24 @@
+@@ -5831,24 +5959,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5313,7 +5262,7 @@
$as_echo "no" >&6; }
fi
-@@ -5858,9 +5986,9 @@
+@@ -5862,9 +5990,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
@@ -5325,7 +5274,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5871,24 +5999,24 @@
+@@ -5875,24 +6003,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5355,7 +5304,7 @@
$as_echo "no" >&6; }
fi
-@@ -5901,7 +6029,7 @@
+@@ -5905,7 +6033,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5364,7 +5313,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5921,44 +6049,44 @@
+@@ -5925,44 +6053,44 @@
@@ -5377,16 +5326,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5931: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6059: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5935: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6063: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5934: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6062: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5938: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6066: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5937: output\"" >&5)
-+ (eval echo "\"\$as_me:6065: output\"" >&5)
+- (eval echo "\"\$as_me:5941: output\"" >&5)
++ (eval echo "\"\$as_me:6069: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5420,7 +5369,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6076,10 +6204,10 @@
+@@ -6080,10 +6208,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5433,7 +5382,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6093,7 +6221,7 @@
+@@ -6097,7 +6225,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -5442,7 +5391,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6103,17 +6231,17 @@
+@@ -6107,17 +6235,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -5463,7 +5412,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6148,14 +6276,14 @@
+@@ -6152,14 +6280,14 @@
@@ -5481,7 +5430,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6184,9 +6312,9 @@
+@@ -6188,9 +6316,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
@@ -5493,7 +5442,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6197,24 +6325,24 @@
+@@ -6201,24 +6329,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5523,7 +5472,7 @@
$as_echo "no" >&6; }
fi
-@@ -6224,9 +6352,9 @@
+@@ -6228,9 +6356,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
@@ -5535,7 +5484,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6237,24 +6365,24 @@
+@@ -6241,24 +6369,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5565,7 +5514,7 @@
$as_echo "no" >&6; }
fi
-@@ -6263,7 +6391,7 @@
+@@ -6267,7 +6395,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5574,7 +5523,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6280,9 +6408,9 @@
+@@ -6284,9 +6412,9 @@
@@ -5586,7 +5535,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6397,11 +6525,11 @@
+@@ -6401,11 +6529,11 @@
;;
# This must be Linux ELF.
@@ -5600,7 +5549,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
-@@ -6476,7 +6604,7 @@
+@@ -6480,7 +6608,7 @@
esac
fi
@@ -5609,7 +5558,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
-@@ -6496,9 +6624,9 @@
+@@ -6500,9 +6628,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
@@ -5621,7 +5570,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -6509,24 +6637,24 @@
+@@ -6513,24 +6641,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5651,7 +5600,7 @@
$as_echo "no" >&6; }
fi
-@@ -6536,9 +6664,9 @@
+@@ -6540,9 +6668,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
@@ -5663,7 +5612,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -6549,24 +6677,24 @@
+@@ -6553,24 +6681,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5693,7 +5642,7 @@
$as_echo "no" >&6; }
fi
-@@ -6575,7 +6703,7 @@
+@@ -6579,7 +6707,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5702,7 +5651,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6601,9 +6729,9 @@
+@@ -6605,9 +6733,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
@@ -5714,7 +5663,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -6614,24 +6742,24 @@
+@@ -6618,24 +6746,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5744,7 +5693,7 @@
$as_echo "no" >&6; }
fi
-@@ -6641,9 +6769,9 @@
+@@ -6645,9 +6773,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
@@ -5756,7 +5705,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -6654,24 +6782,24 @@
+@@ -6658,24 +6786,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5786,7 +5735,7 @@
$as_echo "no" >&6; }
fi
-@@ -6680,7 +6808,7 @@
+@@ -6684,7 +6812,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5795,7 +5744,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6700,9 +6828,9 @@
+@@ -6704,9 +6832,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
@@ -5807,7 +5756,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -6713,24 +6841,24 @@
+@@ -6717,24 +6845,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5837,7 +5786,7 @@
$as_echo "no" >&6; }
fi
-@@ -6740,9 +6868,9 @@
+@@ -6744,9 +6872,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
@@ -5849,7 +5798,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6753,24 +6881,24 @@
+@@ -6757,24 +6885,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5879,7 +5828,7 @@
$as_echo "no" >&6; }
fi
-@@ -6779,7 +6907,7 @@
+@@ -6783,7 +6911,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5888,7 +5837,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6857,9 +6985,9 @@
+@@ -6861,9 +6989,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5900,7 +5849,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -6975,18 +7103,18 @@
+@@ -6979,18 +7107,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -5925,7 +5874,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7039,11 +7167,11 @@
+@@ -7043,11 +7171,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -5940,7 +5889,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7077,10 +7205,10 @@
+@@ -7081,10 +7209,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
@@ -5953,7 +5902,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7107,7 +7235,7 @@
+@@ -7111,7 +7239,7 @@
# Check whether --enable-libtool-lock was given.
@@ -5962,7 +5911,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7119,11 +7247,11 @@
+@@ -7123,11 +7251,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5977,13 +5926,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7137,12 +7265,12 @@
+@@ -7141,12 +7269,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7140 "configure"' > conftest.$ac_ext
+- echo '#line 7144 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7268 "configure"' > conftest.$ac_ext
++ echo '#line 7272 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5994,7 +5943,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7176,11 +7304,11 @@
+@@ -7180,11 +7308,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6009,7 +5958,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7229,9 +7357,9 @@
+@@ -7233,9 +7361,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -6021,7 +5970,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7240,11 +7368,7 @@
+@@ -7244,11 +7372,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6034,7 +5983,7 @@
/* end confdefs.h. */
int
-@@ -7255,38 +7379,13 @@
+@@ -7259,38 +7383,13 @@
return 0;
}
_ACEOF
@@ -6077,7 +6026,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7294,7 +7393,7 @@
+@@ -7298,7 +7397,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -6086,7 +6035,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
-@@ -7304,11 +7403,11 @@
+@@ -7308,11 +7407,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6101,7 +6050,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7334,9 +7433,9 @@
+@@ -7338,9 +7437,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
@@ -6113,7 +6062,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7347,24 +7446,24 @@
+@@ -7351,24 +7450,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6143,7 +6092,7 @@
$as_echo "no" >&6; }
fi
-@@ -7374,9 +7473,9 @@
+@@ -7378,9 +7477,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
@@ -6155,7 +6104,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7387,24 +7486,24 @@
+@@ -7391,24 +7490,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6185,7 +6134,7 @@
$as_echo "no" >&6; }
fi
-@@ -7413,7 +7512,7 @@
+@@ -7417,7 +7516,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6194,7 +6143,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7426,9 +7525,9 @@
+@@ -7430,9 +7529,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
@@ -6206,7 +6155,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7439,24 +7538,24 @@
+@@ -7443,24 +7542,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6236,7 +6185,7 @@
$as_echo "no" >&6; }
fi
-@@ -7466,9 +7565,9 @@
+@@ -7470,9 +7569,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
@@ -6248,7 +6197,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7479,24 +7578,24 @@
+@@ -7483,24 +7582,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6278,7 +6227,7 @@
$as_echo "no" >&6; }
fi
-@@ -7505,7 +7604,7 @@
+@@ -7509,7 +7608,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6287,7 +6236,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7518,9 +7617,9 @@
+@@ -7522,9 +7621,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
@@ -6299,7 +6248,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7531,24 +7630,24 @@
+@@ -7535,24 +7634,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6329,7 +6278,7 @@
$as_echo "no" >&6; }
fi
-@@ -7558,9 +7657,9 @@
+@@ -7562,9 +7661,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
@@ -6341,7 +6290,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7571,24 +7670,24 @@
+@@ -7575,24 +7674,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6371,7 +6320,7 @@
$as_echo "no" >&6; }
fi
-@@ -7597,7 +7696,7 @@
+@@ -7601,7 +7700,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6380,7 +6329,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7610,9 +7709,9 @@
+@@ -7614,9 +7713,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
@@ -6392,7 +6341,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -7623,24 +7722,24 @@
+@@ -7627,24 +7726,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6422,7 +6371,7 @@
$as_echo "no" >&6; }
fi
-@@ -7650,9 +7749,9 @@
+@@ -7654,9 +7753,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
@@ -6434,7 +6383,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -7663,24 +7762,24 @@
+@@ -7667,24 +7766,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6464,7 +6413,7 @@
$as_echo "no" >&6; }
fi
-@@ -7689,7 +7788,7 @@
+@@ -7693,7 +7792,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6473,7 +6422,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7702,9 +7801,9 @@
+@@ -7706,9 +7805,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
@@ -6485,7 +6434,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -7715,24 +7814,24 @@
+@@ -7719,24 +7818,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6515,7 +6464,7 @@
$as_echo "no" >&6; }
fi
-@@ -7742,9 +7841,9 @@
+@@ -7746,9 +7845,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
@@ -6527,7 +6476,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7755,24 +7854,24 @@
+@@ -7759,24 +7858,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6557,7 +6506,7 @@
$as_echo "no" >&6; }
fi
-@@ -7781,7 +7880,7 @@
+@@ -7785,7 +7884,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6566,7 +6515,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7817,9 +7916,9 @@
+@@ -7821,9 +7920,9 @@
@@ -6578,7 +6527,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7844,22 +7943,18 @@
+@@ -7848,22 +7947,18 @@
rm -f conftest.*
fi
fi
@@ -6605,7 +6554,7 @@
/* end confdefs.h. */
int
-@@ -7870,42 +7965,17 @@
+@@ -7874,42 +7969,17 @@
return 0;
}
_ACEOF
@@ -6653,7 +6602,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -7947,14 +8017,14 @@
+@@ -7951,14 +8021,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
@@ -6670,7 +6619,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7969,11 +8039,7 @@
+@@ -7973,11 +8043,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.
@@ -6683,7 +6632,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7982,78 +8048,34 @@
+@@ -7986,78 +8052,34 @@
#endif
Syntax error
_ACEOF
@@ -6767,7 +6716,7 @@
break
fi
-@@ -8065,7 +8087,7 @@
+@@ -8069,7 +8091,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -6776,7 +6725,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -8076,11 +8098,7 @@
+@@ -8080,11 +8102,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.
@@ -6789,7 +6738,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -8089,87 +8107,40 @@
+@@ -8093,87 +8111,40 @@
#endif
Syntax error
_ACEOF
@@ -6886,7 +6835,7 @@
fi
ac_ext=c
-@@ -8179,16 +8150,12 @@
+@@ -8183,16 +8154,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6906,7 +6855,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -8203,48 +8170,23 @@
+@@ -8207,48 +8174,23 @@
return 0;
}
_ACEOF
@@ -6960,7 +6909,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8254,18 +8196,14 @@
+@@ -8258,18 +8200,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6982,7 +6931,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8275,14 +8213,10 @@
+@@ -8279,14 +8217,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6999,7 +6948,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -8309,120 +8243,50 @@
+@@ -8313,120 +8247,50 @@
return 0;
}
_ACEOF
@@ -7144,7 +7093,7 @@
_ACEOF
fi
-@@ -8431,86 +8295,23 @@
+@@ -8435,86 +8299,23 @@
@@ -7248,7 +7197,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -8521,24 +8322,24 @@
+@@ -8525,24 +8326,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7278,7 +7227,7 @@
$as_echo "no" >&6; }
fi
-@@ -8552,9 +8353,9 @@
+@@ -8556,9 +8357,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
@@ -7290,7 +7239,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -8565,24 +8366,24 @@
+@@ -8569,24 +8370,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7320,7 +7269,7 @@
$as_echo "no" >&6; }
fi
-@@ -8595,7 +8396,7 @@
+@@ -8599,7 +8400,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7329,7 +7278,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8606,53 +8407,36 @@
+@@ -8610,53 +8411,36 @@
fi
fi
# Provide some information about the compiler.
@@ -7402,7 +7351,7 @@
/* end confdefs.h. */
int
-@@ -8666,37 +8450,16 @@
+@@ -8670,37 +8454,16 @@
return 0;
}
_ACEOF
@@ -7443,7 +7392,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -8705,20 +8468,16 @@
+@@ -8709,20 +8472,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -7467,7 +7416,7 @@
/* end confdefs.h. */
int
-@@ -8729,35 +8488,11 @@
+@@ -8733,35 +8492,11 @@
return 0;
}
_ACEOF
@@ -7506,7 +7455,7 @@
/* end confdefs.h. */
int
-@@ -8768,36 +8503,12 @@
+@@ -8772,36 +8507,12 @@
return 0;
}
_ACEOF
@@ -7547,7 +7496,7 @@
/* end confdefs.h. */
int
-@@ -8808,42 +8519,17 @@
+@@ -8812,42 +8523,17 @@
return 0;
}
_ACEOF
@@ -7592,7 +7541,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -8868,9 +8554,9 @@
+@@ -8872,9 +8558,9 @@
depcc="$CXX" am_compiler_list=
@@ -7604,7 +7553,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -8978,7 +8664,7 @@
+@@ -8982,7 +8668,7 @@
fi
fi
@@ -7613,7 +7562,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -9001,10 +8687,10 @@
+@@ -9005,10 +8691,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
@@ -7626,7 +7575,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -9019,11 +8705,7 @@
+@@ -9023,11 +8709,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.
@@ -7639,7 +7588,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -9032,78 +8714,34 @@
+@@ -9036,78 +8718,34 @@
#endif
Syntax error
_ACEOF
@@ -7723,7 +7672,7 @@
break
fi
-@@ -9115,7 +8753,7 @@
+@@ -9119,7 +8757,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -7732,7 +7681,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -9126,11 +8764,7 @@
+@@ -9130,11 +8768,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.
@@ -7745,7 +7694,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -9139,81 +8773,37 @@
+@@ -9143,81 +8777,37 @@
#endif
Syntax error
_ACEOF
@@ -7834,7 +7783,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -9240,7 +8830,7 @@
+@@ -9244,7 +8834,7 @@
# Check whether --enable-shared was given.
@@ -7843,7 +7792,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9273,7 +8863,7 @@
+@@ -9277,7 +8867,7 @@
# Check whether --with-pic was given.
@@ -7852,7 +7801,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9289,7 +8879,7 @@
+@@ -9293,7 +8883,7 @@
# Check whether --enable-fast-install was given.
@@ -7861,7 +7810,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9370,9 +8960,9 @@
+@@ -9374,9 +8964,9 @@
setopt NO_GLOB_SUBST
fi
@@ -7873,7 +7822,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9385,7 +8975,7 @@
+@@ -9389,7 +8979,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7882,7 +7831,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9478,9 +9068,9 @@
+@@ -9482,9 +9072,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7894,7 +7843,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9531,10 +9121,10 @@
+@@ -9535,10 +9125,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7907,7 +7856,7 @@
$as_echo "no" >&6; }
fi
-@@ -9544,9 +9134,9 @@
+@@ -9548,9 +9138,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -7919,7 +7868,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9597,10 +9187,10 @@
+@@ -9601,10 +9191,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7932,7 +7881,7 @@
$as_echo "no" >&6; }
fi
-@@ -9677,9 +9267,9 @@
+@@ -9681,9 +9271,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -7944,21 +7893,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9695,11 +9285,11 @@
+@@ -9699,11 +9289,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:9698: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9288: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9702: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9292: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9702: \$? = $ac_status" >&5
-+ echo "$as_me:9292: \$? = $ac_status" >&5
+- echo "$as_me:9706: \$? = $ac_status" >&5
++ echo "$as_me:9296: \$? = $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.
-@@ -9712,7 +9302,7 @@
+@@ -9716,7 +9306,7 @@
$RM conftest*
fi
@@ -7967,7 +7916,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9732,7 +9322,7 @@
+@@ -9736,7 +9326,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -7976,7 +7925,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9864,7 +9454,7 @@
+@@ -9868,7 +9458,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -7985,7 +7934,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10004,7 +9594,7 @@
+@@ -10008,7 +9598,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -7994,7 +7943,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10016,9 +9606,9 @@
+@@ -10020,9 +9610,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -8006,21 +7955,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10034,11 +9624,11 @@
+@@ -10038,11 +9628,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:10037: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9627: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10041: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9631: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:10041: \$? = $ac_status" >&5
-+ echo "$as_me:9631: \$? = $ac_status" >&5
+- echo "$as_me:10045: \$? = $ac_status" >&5
++ echo "$as_me:9635: \$? = $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.
-@@ -10051,7 +9641,7 @@
+@@ -10055,7 +9645,7 @@
$RM conftest*
fi
@@ -8029,7 +7978,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10075,9 +9665,9 @@
+@@ -10079,9 +9669,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -8041,7 +7990,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10103,7 +9693,7 @@
+@@ -10107,7 +9697,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -8050,7 +7999,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10118,9 +9708,9 @@
+@@ -10122,9 +9712,9 @@
@@ -8062,21 +8011,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10139,11 +9729,11 @@
+@@ -10143,11 +9733,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:10142: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9732: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10146: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9736: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10146: \$? = $ac_status" >&5
-+ echo "$as_me:9736: \$? = $ac_status" >&5
+- echo "$as_me:10150: \$? = $ac_status" >&5
++ echo "$as_me:9740: \$? = $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
-@@ -10165,7 +9755,7 @@
+@@ -10169,7 +9759,7 @@
$RM conftest*
fi
@@ -8085,7 +8034,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10173,9 +9763,9 @@
+@@ -10177,9 +9767,9 @@
@@ -8097,21 +8046,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10194,11 +9784,11 @@
+@@ -10198,11 +9788,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:10197: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9787: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10201: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9791: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10201: \$? = $ac_status" >&5
-+ echo "$as_me:9791: \$? = $ac_status" >&5
+- echo "$as_me:10205: \$? = $ac_status" >&5
++ echo "$as_me:9795: \$? = $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
-@@ -10220,7 +9810,7 @@
+@@ -10224,7 +9814,7 @@
$RM conftest*
fi
@@ -8120,7 +8069,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10229,7 +9819,7 @@
+@@ -10233,7 +9823,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
@@ -8129,7 +8078,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10237,10 +9827,10 @@
+@@ -10241,10 +9831,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
@@ -8142,7 +8091,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10253,7 +9843,7 @@
+@@ -10257,7 +9847,7 @@
@@ -8151,7 +8100,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10313,6 +9903,9 @@
+@@ -10317,6 +9907,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -8161,7 +8110,7 @@
esac
ld_shlibs=yes
-@@ -10334,6 +9927,7 @@
+@@ -10338,6 +9931,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -8169,7 +8118,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 ...
-@@ -10425,7 +10019,7 @@
+@@ -10429,7 +10023,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'
;;
@@ -8178,7 +8127,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10495,7 +10089,7 @@
+@@ -10499,7 +10093,7 @@
fi
;;
@@ -8187,7 +8136,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10670,6 +10264,7 @@
+@@ -10674,6 +10268,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -8195,7 +8144,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10695,11 +10290,7 @@
+@@ -10699,11 +10294,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8208,7 +8157,7 @@
/* end confdefs.h. */
int
-@@ -10710,27 +10301,7 @@
+@@ -10714,27 +10305,7 @@
return 0;
}
_ACEOF
@@ -8237,7 +8186,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10744,16 +10315,9 @@
+@@ -10748,16 +10319,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
@@ -8256,7 +8205,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10766,11 +10330,7 @@
+@@ -10770,11 +10334,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8269,7 +8218,7 @@
/* end confdefs.h. */
int
-@@ -10781,27 +10341,7 @@
+@@ -10785,27 +10345,7 @@
return 0;
}
_ACEOF
@@ -8298,7 +8247,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10815,16 +10355,9 @@
+@@ -10819,16 +10359,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
@@ -8317,7 +8266,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11036,42 +10569,16 @@
+@@ -11040,42 +10573,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -8365,7 +8314,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'
-@@ -11084,7 +10591,7 @@
+@@ -11088,7 +10595,7 @@
link_all_deplibs=yes
;;
@@ -8374,7 +8323,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11327,7 +10834,7 @@
+@@ -11331,7 +10838,7 @@
fi
fi
@@ -8383,7 +8332,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11364,16 +10871,16 @@
+@@ -11368,16 +10875,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.
@@ -8404,7 +8353,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11387,11 +10894,11 @@
+@@ -11391,11 +10898,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -8419,7 +8368,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11402,7 +10909,7 @@
+@@ -11406,7 +10913,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -8428,7 +8377,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11566,7 +11073,7 @@
+@@ -11570,7 +11077,7 @@
@@ -8437,7 +8386,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11974,7 +11481,7 @@
+@@ -11978,7 +11485,7 @@
;;
# This must be Linux ELF.
@@ -8446,7 +8395,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11988,11 +11495,7 @@
+@@ -11992,11 +11499,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -8459,7 +8408,7 @@
/* end confdefs.h. */
int
-@@ -12003,41 +11506,13 @@
+@@ -12007,41 +11510,13 @@
return 0;
}
_ACEOF
@@ -8505,7 +8454,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12046,13 +11521,10 @@
+@@ -12050,13 +11525,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -8520,7 +8469,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12064,11 +11536,23 @@
+@@ -12068,11 +11540,23 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8547,7 +8496,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -12252,7 +11736,7 @@
+@@ -12256,7 +11740,7 @@
dynamic_linker=no
;;
esac
@@ -8556,7 +8505,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12354,7 +11838,7 @@
+@@ -12358,7 +11842,7 @@
@@ -8565,7 +8514,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12379,7 +11863,7 @@
+@@ -12383,7 +11867,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -8574,7 +8523,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12424,18 +11908,14 @@
+@@ -12428,18 +11912,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -8596,7 +8545,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12453,43 +11933,18 @@
+@@ -12457,43 +11937,18 @@
return 0;
}
_ACEOF
@@ -8646,7 +8595,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12502,106 +11957,18 @@
+@@ -12506,106 +11961,18 @@
;;
*)
@@ -8758,7 +8707,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12619,145 +11986,32 @@
+@@ -12623,145 +11990,32 @@
return 0;
}
_ACEOF
@@ -8915,7 +8864,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12775,57 +12029,28 @@
+@@ -12779,57 +12033,28 @@
return 0;
}
_ACEOF
@@ -8982,7 +8931,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12843,57 +12068,28 @@
+@@ -12847,57 +12072,28 @@
return 0;
}
_ACEOF
@@ -9049,7 +8998,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12911,43 +12107,18 @@
+@@ -12915,43 +12111,18 @@
return 0;
}
_ACEOF
@@ -9099,7 +9048,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12986,9 +12157,9 @@
+@@ -12990,9 +12161,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9111,16 +9060,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12997,7 +12168,7 @@
+@@ -13001,7 +12172,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13000 "configure"
-+#line 12171 "configure"
+-#line 13004 "configure"
++#line 12175 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13056,11 +12227,11 @@
+@@ -13060,11 +12231,11 @@
return status;
}
_LT_EOF
@@ -9135,7 +9084,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13077,14 +12248,14 @@
+@@ -13081,14 +12252,14 @@
fi
@@ -9153,16 +9102,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13093,7 +12264,7 @@
+@@ -13097,7 +12268,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13096 "configure"
-+#line 12267 "configure"
+-#line 13100 "configure"
++#line 12271 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13152,11 +12323,11 @@
+@@ -13156,11 +12327,11 @@
return status;
}
_LT_EOF
@@ -9177,7 +9126,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13173,7 +12344,7 @@
+@@ -13177,7 +12348,7 @@
fi
@@ -9186,7 +9135,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13212,12 +12383,12 @@
+@@ -13216,12 +12387,12 @@
striplib=
old_striplib=
@@ -9201,7 +9150,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13226,15 +12397,15 @@
+@@ -13230,15 +12401,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -9220,7 +9169,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13252,12 +12423,12 @@
+@@ -13256,12 +12427,12 @@
# Report which library types will actually be built
@@ -9236,7 +9185,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13278,14 +12449,14 @@
+@@ -13282,14 +12453,14 @@
fi
;;
esac
@@ -9254,7 +9203,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13426,7 +12597,7 @@
+@@ -13430,7 +12601,7 @@
# Check whether --with-gnu-ld was given.
@@ -9263,7 +9212,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -13435,7 +12606,7 @@
+@@ -13439,7 +12610,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9272,7 +9221,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -13465,13 +12636,13 @@
+@@ -13469,13 +12640,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9289,7 +9238,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -13502,18 +12673,16 @@
+@@ -13506,18 +12677,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9313,7 +9262,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -13526,7 +12695,7 @@
+@@ -13530,7 +12699,7 @@
;;
esac
fi
@@ -9322,7 +9271,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -13581,7 +12750,7 @@
+@@ -13585,7 +12754,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -9331,7 +9280,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -13682,11 +12851,7 @@
+@@ -13686,11 +12855,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -9344,7 +9293,7 @@
/* end confdefs.h. */
int
-@@ -13697,27 +12862,7 @@
+@@ -13701,27 +12866,7 @@
return 0;
}
_ACEOF
@@ -9373,7 +9322,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13731,16 +12876,9 @@
+@@ -13735,16 +12880,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
@@ -9392,7 +9341,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13754,11 +12892,7 @@
+@@ -13758,11 +12896,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9405,7 +9354,7 @@
/* end confdefs.h. */
int
-@@ -13769,27 +12903,7 @@
+@@ -13773,27 +12907,7 @@
return 0;
}
_ACEOF
@@ -9434,7 +9383,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13803,16 +12917,9 @@
+@@ -13807,16 +12921,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
@@ -9453,7 +9402,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -14097,7 +13204,7 @@
+@@ -14101,7 +13208,7 @@
inherit_rpath_CXX=yes
;;
@@ -9462,7 +9411,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -14556,7 +13663,7 @@
+@@ -14560,7 +13667,7 @@
;;
esac
@@ -9471,7 +9420,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -14584,11 +13691,11 @@
+@@ -14588,11 +13695,11 @@
};
_LT_EOF
@@ -9486,7 +9435,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14769,7 +13876,7 @@
+@@ -14773,7 +13880,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -9495,7 +9444,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -14925,7 +14032,7 @@
+@@ -14929,7 +14036,7 @@
;;
esac
;;
@@ -9504,7 +9453,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14989,7 +14096,7 @@
+@@ -14993,7 +14100,7 @@
;;
esac
;;
@@ -9513,7 +9462,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15086,7 +14193,7 @@
+@@ -15090,7 +14197,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -9522,7 +9471,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -15095,9 +14202,9 @@
+@@ -15099,9 +14206,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -9534,21 +9483,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -15113,11 +14220,11 @@
+@@ -15117,11 +14224,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:15116: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14223: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15120: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14227: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15120: \$? = $ac_status" >&5
-+ echo "$as_me:14227: \$? = $ac_status" >&5
+- echo "$as_me:15124: \$? = $ac_status" >&5
++ echo "$as_me:14231: \$? = $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.
-@@ -15130,7 +14237,7 @@
+@@ -15134,7 +14241,7 @@
$RM conftest*
fi
@@ -9557,7 +9506,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -15151,9 +14258,9 @@
+@@ -15155,9 +14262,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\"
@@ -9569,7 +9518,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -15179,7 +14286,7 @@
+@@ -15183,7 +14290,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9578,7 +9527,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -15191,9 +14298,9 @@
+@@ -15195,9 +14302,9 @@
@@ -9590,21 +9539,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15212,11 +14319,11 @@
+@@ -15216,11 +14323,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:15215: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15219: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14326: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15219: \$? = $ac_status" >&5
-+ echo "$as_me:14326: \$? = $ac_status" >&5
+- echo "$as_me:15223: \$? = $ac_status" >&5
++ echo "$as_me:14330: \$? = $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
-@@ -15238,14 +14345,14 @@
+@@ -15242,14 +14349,14 @@
$RM conftest*
fi
@@ -9622,21 +9571,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15264,11 +14371,11 @@
+@@ -15268,11 +14375,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:15267: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14374: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15271: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15271: \$? = $ac_status" >&5
-+ echo "$as_me:14378: \$? = $ac_status" >&5
+- echo "$as_me:15275: \$? = $ac_status" >&5
++ echo "$as_me:14382: \$? = $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
-@@ -15290,7 +14397,7 @@
+@@ -15294,7 +14401,7 @@
$RM conftest*
fi
@@ -9645,7 +9594,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -15299,7 +14406,7 @@
+@@ -15303,7 +14410,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
@@ -9654,7 +9603,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -15307,10 +14414,10 @@
+@@ -15311,10 +14418,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
@@ -9667,7 +9616,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -15320,7 +14427,7 @@
+@@ -15324,7 +14431,7 @@
@@ -9676,7 +9625,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'
-@@ -15340,13 +14447,16 @@
+@@ -15344,13 +14451,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'
;;
@@ -9694,7 +9643,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -15374,16 +14484,16 @@
+@@ -15378,16 +14488,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.
@@ -9715,7 +9664,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -15397,11 +14507,11 @@
+@@ -15401,11 +14511,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -9730,7 +9679,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -15412,7 +14522,7 @@
+@@ -15416,7 +14526,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -9739,7 +9688,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -15483,7 +14593,7 @@
+@@ -15487,7 +14597,7 @@
@@ -9748,7 +9697,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -15839,7 +14949,7 @@
+@@ -15843,7 +14953,7 @@
;;
# This must be Linux ELF.
@@ -9757,7 +9706,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15853,11 +14963,7 @@
+@@ -15857,11 +14967,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -9770,7 +9719,7 @@
/* end confdefs.h. */
int
-@@ -15868,41 +14974,13 @@
+@@ -15872,41 +14978,13 @@
return 0;
}
_ACEOF
@@ -9816,7 +9765,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -15911,13 +14989,10 @@
+@@ -15915,13 +14993,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -9831,7 +9780,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15929,6 +15004,18 @@
+@@ -15933,6 +15008,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9850,7 +9799,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16117,7 +15204,7 @@
+@@ -16121,7 +15208,7 @@
dynamic_linker=no
;;
esac
@@ -9859,7 +9808,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -16168,7 +15255,7 @@
+@@ -16172,7 +15259,7 @@
@@ -9868,7 +9817,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -16193,7 +15280,7 @@
+@@ -16197,7 +15284,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -9877,7 +9826,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -16252,7 +15339,7 @@
+@@ -16256,7 +15343,7 @@
: ${CONFIG_LT=./config.lt}
@@ -9886,7 +9835,7 @@
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
cat >"$CONFIG_LT" <<_LTEOF
#! $SHELL
-@@ -16264,13 +15351,13 @@
+@@ -16268,13 +15355,13 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -9904,7 +9853,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -16278,23 +15365,15 @@
+@@ -16282,23 +15369,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9933,7 +9882,7 @@
as_nl='
'
export as_nl
-@@ -16302,7 +15381,13 @@
+@@ -16306,7 +15385,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
@@ -9948,7 +9897,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -16313,7 +15398,7 @@
+@@ -16317,7 +15402,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9957,7 +9906,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -16336,13 +15421,6 @@
+@@ -16340,13 +15425,6 @@
}
fi
@@ -9971,7 +9920,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -16352,15 +15430,15 @@
+@@ -16356,15 +15434,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9990,7 +9939,7 @@
IFS=$as_save_IFS
;;
-@@ -16372,12 +15450,16 @@
+@@ -16376,12 +15454,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -10011,7 +9960,7 @@
done
PS1='$ '
PS2='> '
-@@ -16389,7 +15471,90 @@
+@@ -16393,7 +15475,90 @@
LANGUAGE=C
export LANGUAGE
@@ -10103,7 +10052,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -16403,8 +15568,12 @@
+@@ -16407,8 +15572,12 @@
as_basename=false
fi
@@ -10117,7 +10066,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -16424,77 +15593,25 @@
+@@ -16428,77 +15597,25 @@
}
s/.*/./; q'`
@@ -10206,7 +10155,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -16523,8 +15640,56 @@
+@@ -16527,8 +15644,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -10264,7 +10213,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -16543,10 +15708,10 @@
+@@ -16547,10 +15712,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -10277,16 +10226,16 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -16586,7 +15751,7 @@
+@@ -16590,7 +15755,7 @@
lt_cl_version="\
- gtk+ config.lt 2.18.6
+ gtk+ config.lt 2.18.7
-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
-@@ -16604,17 +15769,11 @@
+@@ -16608,17 +15773,11 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -10309,7 +10258,7 @@
esac
shift
done
-@@ -16980,7 +16139,7 @@
+@@ -16984,7 +16143,7 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -10318,7 +10267,7 @@
$as_echo "$as_me: creating $ofile" >&6;}
-@@ -17790,7 +16949,7 @@
+@@ -17794,7 +16953,7 @@
_LT_EOF
@@ -10327,7 +10276,7 @@
_LTEOF
chmod +x "$CONFIG_LT"
-@@ -17805,22 +16964,22 @@
+@@ -17809,22 +16968,22 @@
exec 5>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
exec 5>>config.log
@@ -10354,7 +10303,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -17829,11 +16988,7 @@
+@@ -17833,11 +16992,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.
@@ -10367,7 +10316,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17852,60 +17007,14 @@
+@@ -17856,60 +17011,14 @@
return 0;
}
_ACEOF
@@ -10430,7 +10379,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -17913,23 +17022,19 @@
+@@ -17917,23 +17026,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -10458,7 +10407,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17948,38 +17053,11 @@
+@@ -17952,38 +17057,11 @@
return 0;
}
_ACEOF
@@ -10499,7 +10448,7 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -17999,38 +17077,15 @@
+@@ -18003,38 +17081,15 @@
return 0;
}
_ACEOF
@@ -10540,7 +10489,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -18042,17 +17097,13 @@
+@@ -18046,17 +17101,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -10561,7 +10510,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -18071,38 +17122,11 @@
+@@ -18075,38 +17126,11 @@
return 0;
}
_ACEOF
@@ -10602,7 +10551,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -18122,38 +17146,15 @@
+@@ -18126,38 +17150,15 @@
return 0;
}
_ACEOF
@@ -10643,7 +10592,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -18177,9 +17178,9 @@
+@@ -18181,9 +17182,9 @@
depcc="$CCAS" am_compiler_list=
@@ -10655,7 +10604,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -18285,7 +17286,7 @@
+@@ -18289,7 +17290,7 @@
fi
fi
@@ -10664,7 +10613,7 @@
$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-@@ -18302,9 +17303,9 @@
+@@ -18306,9 +17307,9 @@
# Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2
@@ -10676,7 +10625,7 @@
$as_echo_n "(cached) " >&6
else
case $NM in
-@@ -18317,14 +17318,14 @@
+@@ -18321,14 +17322,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10694,7 +10643,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm"
-@@ -18333,26 +17334,26 @@
+@@ -18337,26 +17338,26 @@
fi
NM=$ac_cv_path_NM
if test -n "$NM"; then
@@ -10726,7 +10675,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -18366,7 +17367,7 @@
+@@ -18370,7 +17371,7 @@
@@ -10735,7 +10684,7 @@
$as_echo_n "checking for some Win32 platform... " >&6; }
case "$host" in
*-*-mingw*|*-*-cygwin*)
-@@ -18376,7 +17377,7 @@
+@@ -18380,7 +17381,7 @@
platform_win32=no
;;
esac
@@ -10744,7 +10693,7 @@
$as_echo "$platform_win32" >&6; }
if test "$platform_win32" = "yes"; then
PLATFORM_WIN32_TRUE=
-@@ -18416,9 +17417,9 @@
+@@ -18420,9 +17421,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
@@ -10756,7 +10705,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
-@@ -18429,24 +17430,24 @@
+@@ -18433,24 +17434,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10786,7 +10735,7 @@
$as_echo "no" >&6; }
fi
-@@ -18456,9 +17457,9 @@
+@@ -18460,9 +17461,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
@@ -10798,7 +10747,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
-@@ -18469,24 +17470,24 @@
+@@ -18473,24 +17474,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10828,7 +10777,7 @@
$as_echo "no" >&6; }
fi
-@@ -18495,7 +17496,7 @@
+@@ -18499,7 +17500,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10837,7 +10786,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -18506,15 +17507,13 @@
+@@ -18510,15 +17511,13 @@
fi
if test "$WINDRES" = no; then
@@ -10856,7 +10805,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ms_librarian"; then
-@@ -18525,14 +17524,14 @@
+@@ -18529,14 +17528,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10874,7 +10823,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no"
-@@ -18540,10 +17539,10 @@
+@@ -18544,10 +17543,10 @@
fi
ms_librarian=$ac_cv_prog_ms_librarian
if test -n "$ms_librarian"; then
@@ -10887,7 +10836,7 @@
$as_echo "no" >&6; }
fi
-@@ -18561,42 +17560,42 @@
+@@ -18565,42 +17564,42 @@
# Check whether --enable-debug was given.
@@ -10936,7 +10885,7 @@
enableval=$enable_visibility;
else
enable_visibility=yes
-@@ -18605,7 +17604,7 @@
+@@ -18609,7 +17608,7 @@
# Check whether --with-xinput was given.
@@ -10945,7 +10894,7 @@
withval=$with_xinput;
fi
-@@ -18618,7 +17617,7 @@
+@@ -18622,7 +17621,7 @@
# Check whether --with-gdktarget was given.
@@ -10954,7 +10903,7 @@
withval=$with_gdktarget; gdktarget=$with_gdktarget
fi
-@@ -18626,9 +17625,7 @@
+@@ -18630,9 +17629,7 @@
case $gdktarget in
x11|win32|quartz|directfb) ;;
@@ -10965,7 +10914,7 @@
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -18662,7 +17659,7 @@
+@@ -18666,7 +17663,7 @@
# Build time sanity check...
@@ -10974,7 +10923,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -18673,15 +17670,11 @@
+@@ -18677,15 +17674,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -10992,7 +10941,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -18703,11 +17696,8 @@
+@@ -18707,11 +17700,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".
@@ -11006,7 +10955,7 @@
fi
test "$2" = conftest.file
-@@ -18716,27 +17706,20 @@
+@@ -18720,27 +17710,20 @@
# Ok.
:
else
@@ -11040,7 +10989,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18761,54 +17744,27 @@
+@@ -18765,54 +17748,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -11103,7 +11052,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -18821,9 +17777,9 @@
+@@ -18825,9 +17781,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
@@ -11115,7 +11064,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18834,24 +17790,24 @@
+@@ -18838,24 +17794,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11145,7 +11094,7 @@
$as_echo "no" >&6; }
fi
-@@ -18861,9 +17817,9 @@
+@@ -18865,9 +17821,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
@@ -11157,7 +11106,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -18874,24 +17830,24 @@
+@@ -18878,24 +17834,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11187,7 +11136,7 @@
$as_echo "no" >&6; }
fi
-@@ -18900,7 +17856,7 @@
+@@ -18904,7 +17860,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11196,7 +11145,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -18914,9 +17870,9 @@
+@@ -18918,9 +17874,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
@@ -11208,7 +11157,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18927,24 +17883,24 @@
+@@ -18931,24 +17887,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11238,7 +11187,7 @@
$as_echo "no" >&6; }
fi
-@@ -18954,9 +17910,9 @@
+@@ -18958,9 +17914,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
@@ -11250,7 +11199,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18968,18 +17924,18 @@
+@@ -18972,18 +17928,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11272,7 +11221,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -18998,10 +17954,10 @@
+@@ -19002,10 +17958,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -11285,7 +11234,7 @@
$as_echo "no" >&6; }
fi
-@@ -19013,9 +17969,9 @@
+@@ -19017,9 +17973,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
@@ -11297,7 +11246,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -19026,24 +17982,24 @@
+@@ -19030,24 +17986,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11327,7 +11276,7 @@
$as_echo "no" >&6; }
fi
-@@ -19057,9 +18013,9 @@
+@@ -19061,9 +18017,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
@@ -11339,7 +11288,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -19070,24 +18026,24 @@
+@@ -19074,24 +18030,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11369,7 +11318,7 @@
$as_echo "no" >&6; }
fi
-@@ -19100,7 +18056,7 @@
+@@ -19104,7 +18060,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11378,7 +11327,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -19111,62 +18067,42 @@
+@@ -19115,62 +18071,42 @@
fi
@@ -11463,7 +11412,7 @@
/* end confdefs.h. */
int
-@@ -19180,37 +18116,16 @@
+@@ -19184,37 +18120,16 @@
return 0;
}
_ACEOF
@@ -11504,7 +11453,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -19219,20 +18134,16 @@
+@@ -19223,20 +18138,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -11528,7 +11477,7 @@
/* end confdefs.h. */
int
-@@ -19243,35 +18154,11 @@
+@@ -19247,35 +18158,11 @@
return 0;
}
_ACEOF
@@ -11567,7 +11516,7 @@
/* end confdefs.h. */
int
-@@ -19282,36 +18169,12 @@
+@@ -19286,36 +18173,12 @@
return 0;
}
_ACEOF
@@ -11608,7 +11557,7 @@
/* end confdefs.h. */
int
-@@ -19322,42 +18185,17 @@
+@@ -19326,42 +18189,17 @@
return 0;
}
_ACEOF
@@ -11653,7 +11602,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -19374,18 +18212,14 @@
+@@ -19378,18 +18216,14 @@
CFLAGS=
fi
fi
@@ -11675,7 +11624,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -19442,32 +18276,9 @@
+@@ -19446,32 +18280,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -11709,7 +11658,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -19478,17 +18289,19 @@
+@@ -19482,17 +18293,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -11732,7 +11681,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -19498,9 +18311,9 @@
+@@ -19502,9 +18315,9 @@
depcc="$CC" am_compiler_list=
@@ -11744,7 +11693,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -19608,7 +18421,7 @@
+@@ -19612,7 +18425,7 @@
fi
fi
@@ -11753,7 +11702,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -19627,22 +18440,18 @@
+@@ -19631,22 +18444,18 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
if test "x$CC" != xcc; then
@@ -11780,7 +11729,7 @@
/* end confdefs.h. */
int
-@@ -19658,63 +18467,63 @@
+@@ -19662,63 +18471,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.*
@@ -11869,7 +11818,7 @@
then
# cc works too.
:
-@@ -19731,15 +18540,13 @@
+@@ -19735,15 +18544,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -11888,7 +11837,7 @@
fi
-@@ -19758,104 +18565,12 @@
+@@ -19762,104 +18569,12 @@
fi
@@ -11995,7 +11944,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -19873,11 +18588,11 @@
+@@ -19877,11 +18592,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -12009,7 +11958,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -19911,7 +18626,7 @@
+@@ -19915,7 +18630,7 @@
if test x"$os_win32" = xyes; then
if test x"$GCC" = xyes; then
msnative_struct=''
@@ -12018,7 +11967,7 @@
$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; }
if test -z "$ac_cv_prog_CC"; then
our_gcc="$CC"
-@@ -19931,13 +18646,13 @@
+@@ -19935,13 +18650,13 @@
;;
esac
if test x"$msnative_struct" = x ; then
@@ -12035,7 +11984,7 @@
$as_echo "${msnative_struct}" >&6; }
fi
fi
-@@ -19958,9 +18673,9 @@
+@@ -19962,9 +18677,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
@@ -12047,7 +11996,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -19973,14 +18688,14 @@
+@@ -19977,14 +18692,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12065,7 +12014,7 @@
IFS=$as_save_IFS
;;
-@@ -19988,10 +18703,10 @@
+@@ -19992,10 +18707,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12078,7 +12027,7 @@
$as_echo "no" >&6; }
fi
-@@ -20001,9 +18716,9 @@
+@@ -20005,9 +18720,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
@@ -12090,7 +12039,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -20016,14 +18731,14 @@
+@@ -20020,14 +18735,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12108,7 +12057,7 @@
IFS=$as_save_IFS
;;
-@@ -20031,10 +18746,10 @@
+@@ -20035,10 +18750,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12121,7 +12070,7 @@
$as_echo "no" >&6; }
fi
-@@ -20043,7 +18758,7 @@
+@@ -20047,7 +18762,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12130,7 +12079,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -20056,13 +18771,13 @@
+@@ -20060,13 +18775,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12147,7 +12096,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -20070,40 +18785,44 @@
+@@ -20074,40 +18789,44 @@
fi
pkg_failed=no
@@ -12211,7 +12160,7 @@
fi
-@@ -20116,25 +18835,14 @@
+@@ -20120,25 +18839,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12240,7 +12189,7 @@
$BASE_DEPENDENCIES_PKG_ERRORS
-@@ -20144,22 +18852,11 @@
+@@ -20148,22 +18856,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.
@@ -12266,7 +12215,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20168,12 +18865,11 @@
+@@ -20172,12 +18869,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12281,7 +12230,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20190,40 +18886,44 @@
+@@ -20194,40 +18890,44 @@
fi
pkg_failed=no
@@ -12345,7 +12294,7 @@
fi
-@@ -20236,14 +18936,14 @@
+@@ -20240,14 +18940,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12363,7 +12312,7 @@
$CAIRO_BACKEND_PKG_ERRORS
-@@ -20253,47 +18953,24 @@
+@@ -20257,47 +18957,24 @@
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.
@@ -12423,7 +12372,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20310,14 +18987,14 @@
+@@ -20314,14 +18991,14 @@
# Check whether --enable-explicit-deps was given.
@@ -12440,7 +12389,7 @@
$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; }
case $enable_explicit_deps in
auto)
-@@ -20331,12 +19008,10 @@
+@@ -20335,12 +19012,10 @@
;;
yes|no)
;;
@@ -12455,7 +12404,7 @@
$as_echo "$enable_explicit_deps" >&6; }
if test $enable_explicit_deps = no; then
-@@ -20355,9 +19030,9 @@
+@@ -20359,9 +19034,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
@@ -12467,7 +12416,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -20370,14 +19045,14 @@
+@@ -20374,14 +19049,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12485,7 +12434,7 @@
IFS=$as_save_IFS
;;
-@@ -20385,10 +19060,10 @@
+@@ -20389,10 +19064,10 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -12498,7 +12447,7 @@
$as_echo "no" >&6; }
fi
-@@ -20400,9 +19075,9 @@
+@@ -20404,9 +19079,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
@@ -12510,7 +12459,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$INDENT"; then
-@@ -20413,24 +19088,24 @@
+@@ -20417,24 +19092,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12540,7 +12489,7 @@
$as_echo "no" >&6; }
fi
-@@ -20444,103 +19119,12 @@
+@@ -20448,103 +19123,12 @@
fi
@@ -12649,7 +12598,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -20548,102 +19132,12 @@
+@@ -20552,102 +19136,12 @@
fi
done
@@ -12756,7 +12705,7 @@
_ACEOF
fi
-@@ -20651,13 +19145,9 @@
+@@ -20655,13 +19149,9 @@
# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
@@ -12772,7 +12721,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20671,56 +19161,25 @@
+@@ -20675,56 +19165,25 @@
return 0;
}
_ACEOF
@@ -12837,7 +12786,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20734,56 +19193,25 @@
+@@ -20738,56 +19197,25 @@
return 0;
}
_ACEOF
@@ -12902,7 +12851,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20797,56 +19225,25 @@
+@@ -20801,56 +19229,25 @@
return 0;
}
_ACEOF
@@ -12967,7 +12916,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20860,56 +19257,25 @@
+@@ -20864,56 +19261,25 @@
return 0;
}
_ACEOF
@@ -13032,7 +12981,7 @@
/* end confdefs.h. */
#include <setjmp.h>
int
-@@ -20923,263 +19289,66 @@
+@@ -20927,263 +19293,66 @@
return 0;
}
_ACEOF
@@ -13332,7 +13281,7 @@
fi
fi
-@@ -21192,155 +19361,20 @@
+@@ -21196,155 +19365,20 @@
XGETTEXT=:
INTLLIBS=
@@ -13493,7 +13442,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -21353,54 +19387,25 @@
+@@ -21357,54 +19391,25 @@
return 0;
}
_ACEOF
@@ -13556,7 +13505,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -21413,141 +19418,26 @@
+@@ -21417,141 +19422,26 @@
return 0;
}
_ACEOF
@@ -13708,7 +13657,7 @@
_ACEOF
fi
-@@ -21562,18 +19452,14 @@
+@@ -21566,18 +19456,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13730,7 +13679,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21591,55 +19477,26 @@
+@@ -21595,55 +19481,26 @@
return 0;
}
_ACEOF
@@ -13795,7 +13744,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21657,55 +19514,26 @@
+@@ -21661,55 +19518,26 @@
return 0;
}
_ACEOF
@@ -13860,7 +13809,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21723,43 +19551,18 @@
+@@ -21727,43 +19555,18 @@
return 0;
}
_ACEOF
@@ -13910,7 +13859,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -21769,22 +19572,18 @@
+@@ -21773,22 +19576,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13938,7 +13887,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21802,55 +19601,26 @@
+@@ -21806,55 +19605,26 @@
return 0;
}
_ACEOF
@@ -14003,7 +13952,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21868,43 +19638,18 @@
+@@ -21872,43 +19642,18 @@
return 0;
}
_ACEOF
@@ -14053,7 +14002,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -21926,102 +19671,12 @@
+@@ -21930,102 +19675,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -14161,7 +14110,7 @@
_ACEOF
fi
-@@ -22051,15 +19706,13 @@
+@@ -22055,15 +19710,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -14180,7 +14129,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -22084,118 +19737,28 @@
+@@ -22088,118 +19741,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -14307,7 +14256,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -22210,14 +19773,14 @@
+@@ -22214,14 +19777,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -14327,7 +14276,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -22225,9 +19788,9 @@
+@@ -22229,9 +19792,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -14339,7 +14288,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -22240,14 +19803,14 @@
+@@ -22244,14 +19807,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14357,7 +14306,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -22256,19 +19819,19 @@
+@@ -22260,19 +19823,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14381,7 +14330,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -22293,18 +19856,14 @@
+@@ -22297,18 +19860,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14403,7 +14352,7 @@
/* end confdefs.h. */
int
-@@ -22316,155 +19875,44 @@
+@@ -22320,155 +19879,44 @@
return 0;
}
_ACEOF
@@ -14585,7 +14534,7 @@
fi
-@@ -22472,7 +19920,7 @@
+@@ -22476,7 +19924,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -14594,7 +14543,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -22505,7 +19953,7 @@
+@@ -22509,7 +19957,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -14603,7 +14552,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -22530,7 +19978,7 @@
+@@ -22534,7 +19982,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -14612,7 +14561,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -22601,129 +20049,67 @@
+@@ -22605,129 +20053,67 @@
@@ -14762,7 +14711,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -22732,27 +20118,23 @@
+@@ -22736,27 +20122,23 @@
#
# see bug 162979
#
@@ -14795,7 +14744,7 @@
/* end confdefs.h. */
#include <dirent.h>
int
-@@ -22763,37 +20145,13 @@
+@@ -22767,37 +20149,13 @@
return 0;
}
_ACEOF
@@ -14837,7 +14786,7 @@
/* end confdefs.h. */
#include <dirent.h>
int
-@@ -22804,40 +20162,18 @@
+@@ -22808,40 +20166,18 @@
return 0;
}
_ACEOF
@@ -14882,7 +14831,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
#
-@@ -22847,7 +20183,7 @@
+@@ -22851,7 +20187,7 @@
GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
# Check whether --enable-glibtest was given.
@@ -14891,7 +14840,7 @@
enableval=$enable_glibtest;
else
enable_glibtest=yes
-@@ -22882,9 +20218,9 @@
+@@ -22886,9 +20222,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
@@ -14903,7 +14852,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -22897,14 +20233,14 @@
+@@ -22901,14 +20237,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14921,7 +14870,7 @@
IFS=$as_save_IFS
;;
-@@ -22912,10 +20248,10 @@
+@@ -22916,10 +20252,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -14934,7 +14883,7 @@
$as_echo "no" >&6; }
fi
-@@ -22925,9 +20261,9 @@
+@@ -22929,9 +20265,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
@@ -14946,7 +14895,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -22940,14 +20276,14 @@
+@@ -22944,14 +20280,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14964,7 +14913,7 @@
IFS=$as_save_IFS
;;
-@@ -22955,10 +20291,10 @@
+@@ -22959,10 +20295,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -14977,7 +14926,7 @@
$as_echo "no" >&6; }
fi
-@@ -22967,7 +20303,7 @@
+@@ -22971,7 +20307,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14986,7 +14935,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -22980,13 +20316,13 @@
+@@ -22984,13 +20320,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.16
@@ -15003,7 +14952,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -23001,7 +20337,7 @@
+@@ -23005,7 +20341,7 @@
fi
min_glib_version=2.21.3
@@ -15012,7 +14961,7 @@
$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
if test x$PKG_CONFIG != xno ; then
-@@ -23037,14 +20373,10 @@
+@@ -23041,14 +20377,10 @@
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
rm -f conf.glibtest
@@ -15029,18 +14978,18 @@
/* end confdefs.h. */
#include <glib.h>
-@@ -23056,9 +20388,8 @@
+@@ -23060,8 +20392,9 @@
{
int major, minor, micro;
char *tmp_version;
-- int ignored;
-
-- ignored = system ("touch conf.glibtest");
-+ fclose (fopen ("conf.glibtest", "w"));
++ int ignored;
+
+- fclose (fopen ("conf.glibtest", "w"));
++ ignored = system ("touch conf.glibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
-@@ -23120,52 +20451,25 @@
+@@ -23123,52 +20456,25 @@
}
_ACEOF
@@ -15100,7 +15049,7 @@
$as_echo "no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
-@@ -23179,11 +20483,7 @@
+@@ -23182,11 +20488,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
@@ -15113,7 +15062,7 @@
/* end confdefs.h. */
#include <glib.h>
-@@ -23197,27 +20497,7 @@
+@@ -23200,27 +20502,7 @@
return 0;
}
_ACEOF
@@ -15142,7 +15091,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"
-@@ -23228,16 +20508,11 @@
+@@ -23231,16 +20513,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
@@ -15162,7 +15111,7 @@
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
-@@ -23247,4510 +20522,339 @@
+@@ -23250,4510 +20527,339 @@
GLIB_GENMARSHAL=""
GOBJECT_QUERY=""
GLIB_MKENUMS=""
@@ -19925,7 +19874,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -27763,480 +20867,383 @@
+@@ -27766,480 +20872,383 @@
return 0;
}
_ACEOF
@@ -20722,7 +20671,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -28245,760 +21252,639 @@
+@@ -28248,760 +21257,639 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -21981,7 +21930,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29007,794 +21893,663 @@
+@@ -29010,794 +21898,663 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -23309,7 +23258,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29803,79 +22558,50 @@
+@@ -29806,79 +22563,50 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -23416,7 +23365,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29884,499 +22610,554 @@
+@@ -29887,499 +22615,554 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -24370,7 +24319,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30384,103 +23165,27 @@
+@@ -30387,103 +23170,27 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -24484,7 +24433,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30488,116 +23193,40 @@
+@@ -30491,116 +23198,40 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -24625,7 +24574,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30605,99 +23234,59 @@
+@@ -30608,99 +23239,59 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -24760,7 +24709,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30705,97 +23294,40 @@
+@@ -30708,97 +23299,40 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -24877,7 +24826,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30803,150 +23335,153 @@
+@@ -30806,150 +23340,153 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25145,7 +25094,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30954,73 +23489,50 @@
+@@ -30957,73 +23494,50 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25250,7 +25199,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31029,345 +23541,294 @@
+@@ -31032,345 +23546,294 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25828,7 +25777,7 @@
else
no_sys_shm=yes
-@@ -31377,18 +23838,14 @@
+@@ -31380,18 +23843,14 @@
# Check for the X shared memory extension header file
have_xshm=no
@@ -25849,7 +25798,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -31407,42 +23864,17 @@
+@@ -31410,42 +23869,17 @@
return 0;
}
_ACEOF
@@ -25895,7 +25844,7 @@
fi
fi
-@@ -31453,7 +23885,7 @@
+@@ -31456,7 +23890,7 @@
CPPFLAGS="$CPPFLAGS $x_cflags"
# Check for XFree
@@ -25904,7 +25853,7 @@
$as_echo_n "checking for Xinerama support on XFree86... " >&6; }
have_xfree_xinerama=false
-@@ -31461,18 +23893,14 @@
+@@ -31464,18 +23898,14 @@
have_xfree_xinerama=true
X_PACKAGES="$X_PACKAGES xinerama"
else
@@ -25926,7 +25875,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31490,89 +23918,21 @@
+@@ -31493,89 +23923,21 @@
return 0;
}
_ACEOF
@@ -26025,7 +25974,7 @@
case "$x_extra_libs " in
*-lXinerama[\ \ ]*) ;;
*) x_extra_libs="-lXinerama $x_extra_libs" ;;
-@@ -31580,170 +23940,39 @@
+@@ -31583,170 +23945,39 @@
have_xfree_xinerama=true
else
@@ -26226,7 +26175,7 @@
have_solaris_xinerama=true
else
:
-@@ -31755,19 +23984,15 @@
+@@ -31758,19 +23989,15 @@
if $have_solaris_xinerama ; then
@@ -26250,7 +26199,7 @@
$as_echo "no" >&6; }
fi
;;
-@@ -31781,9 +24006,7 @@
+@@ -31784,9 +24011,7 @@
if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
@@ -26261,7 +26210,7 @@
if $PKG_CONFIG --exists xi ; then
-@@ -31797,9 +24020,7 @@
+@@ -31800,9 +24025,7 @@
fi
else
@@ -26272,7 +26221,7 @@
fi
-@@ -31815,9 +24036,7 @@
+@@ -31818,9 +24041,7 @@
# Check for the RANDR extension
if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@@ -26283,7 +26232,7 @@
X_PACKAGES="$X_PACKAGES xrandr"
-@@ -31827,9 +24046,7 @@
+@@ -31830,9 +24051,7 @@
if $PKG_CONFIG --exists xcursor ; then
@@ -26294,7 +26243,7 @@
X_PACKAGES="$X_PACKAGES xcursor"
-@@ -31839,9 +24056,7 @@
+@@ -31842,9 +24061,7 @@
if $PKG_CONFIG --exists xfixes ; then
@@ -26305,7 +26254,7 @@
X_PACKAGES="$X_PACKAGES xfixes"
-@@ -31852,9 +24067,7 @@
+@@ -31855,9 +24072,7 @@
if $PKG_CONFIG --exists xcomposite ; then
@@ -26316,7 +26265,7 @@
X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -31865,9 +24078,7 @@
+@@ -31868,9 +24083,7 @@
if $PKG_CONFIG --exists xdamage ; then
@@ -26327,7 +26276,7 @@
X_PACKAGES="$X_PACKAGES xdamage"
-@@ -31973,45 +24184,49 @@
+@@ -31976,45 +24189,49 @@
if test "x$gdktarget" = "xdirectfb"; then
DIRECTFB_REQUIRED_VERSION=1.0.0
@@ -26397,7 +26346,7 @@
fi
-@@ -32024,25 +24239,14 @@
+@@ -32027,25 +24244,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -26426,7 +26375,7 @@
$DIRECTFB_PKG_ERRORS
-@@ -32052,22 +24256,11 @@
+@@ -32055,22 +24261,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.
@@ -26452,7 +26401,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -32076,12 +24269,11 @@
+@@ -32079,12 +24274,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -26467,7 +26416,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -32113,24 +24305,19 @@
+@@ -32116,24 +24310,19 @@
PANGO_PACKAGES="pango pangocairo"
fi
@@ -26496,7 +26445,7 @@
fi
CFLAGS="$CFLAGS $PANGO_CFLAGS"
-@@ -32140,11 +24327,7 @@
+@@ -32143,11 +24332,7 @@
else
gtk_save_LIBS="$LIBS"
LIBS="$PANGO_LIBS $LIBS"
@@ -26509,7 +26458,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32162,60 +24345,33 @@
+@@ -32165,60 +24350,33 @@
return 0;
}
_ACEOF
@@ -26581,7 +26530,7 @@
fi
-@@ -32225,29 +24381,25 @@
+@@ -32228,29 +24386,25 @@
@@ -26616,7 +26565,7 @@
fi
if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
-@@ -32255,11 +24407,7 @@
+@@ -32258,11 +24412,7 @@
else
gtk_save_LIBS="$LIBS"
LIBS="$ATK_LIBS $LIBS"
@@ -26629,7 +26578,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32277,44 +24425,15 @@
+@@ -32280,44 +24430,15 @@
return 0;
}
_ACEOF
@@ -26679,7 +26628,7 @@
LIBS="$gtk_save_LIBS"
fi
-@@ -32337,7 +24456,7 @@
+@@ -32340,7 +24461,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then
@@ -26688,7 +26637,7 @@
fi
-@@ -32365,17 +24484,13 @@
+@@ -32368,17 +24489,13 @@
########################
old_LIBS="$LIBS"
@@ -26709,7 +26658,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32400,69 +24515,38 @@
+@@ -32403,69 +24520,38 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -26790,7 +26739,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32487,69 +24571,38 @@
+@@ -32490,69 +24576,38 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -26871,7 +26820,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32574,161 +24627,37 @@
+@@ -32577,161 +24632,37 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -27044,7 +26993,7 @@
struct_sockaddr_un_sun_len=true
else
struct_sockaddr_un_suin_len=false
-@@ -32756,7 +24685,7 @@
+@@ -32759,7 +24690,7 @@
################################################################
# Check whether --enable-cups was given.
@@ -27053,7 +27002,7 @@
enableval=$enable_cups;
else
enable_cups=auto
-@@ -32775,9 +24704,9 @@
+@@ -32778,9 +24709,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
@@ -27065,7 +27014,7 @@
$as_echo_n "(cached) " >&6
else
case $CUPS_CONFIG in
-@@ -32790,14 +24719,14 @@
+@@ -32793,14 +24724,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -27083,7 +27032,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no"
-@@ -32806,10 +24735,10 @@
+@@ -32809,10 +24740,10 @@
fi
CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
if test -n "$CUPS_CONFIG"; then
@@ -27096,7 +27045,7 @@
$as_echo "no" >&6; }
fi
-@@ -32825,13 +24754,9 @@
+@@ -32828,13 +24759,9 @@
fi
else
@@ -27112,7 +27061,7 @@
fi
else
CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'`
-@@ -32844,155 +24769,20 @@
+@@ -32847,155 +24774,20 @@
if test $CUPS_API_MAJOR -gt 1 -o \
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
@@ -27274,7 +27223,7 @@
fi
-@@ -33008,11 +24798,7 @@
+@@ -33011,11 +24803,7 @@
gtk_save_cflags="$CFLAGS"
CFLAGS="$CUPS_CFLAGS"
@@ -27287,7 +27236,7 @@
/* end confdefs.h. */
#include <cups/http.h>
int
-@@ -33023,36 +24809,11 @@
+@@ -33026,36 +24814,11 @@
return 0;
}
_ACEOF
@@ -27326,7 +27275,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$gtk_save_cflags"
-@@ -33060,102 +24821,12 @@
+@@ -33063,102 +24826,12 @@
gtk_save_libs="$LIBS"
LIBS="$CUPS_LIBS"
@@ -27434,7 +27383,7 @@
_ACEOF
fi
-@@ -33169,7 +24840,7 @@
+@@ -33172,7 +24845,7 @@
#
# Check whether --enable-papi was given.
@@ -27443,7 +27392,7 @@
enableval=$enable_papi;
else
enable_papi=auto
-@@ -33186,20 +24857,16 @@
+@@ -33189,20 +24862,16 @@
fi
else
@@ -27468,7 +27417,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -33217,43 +24884,18 @@
+@@ -33220,43 +24889,18 @@
return 0;
}
_ACEOF
@@ -27518,7 +27467,7 @@
have_papi=yes
else
have_papi=no
-@@ -33261,9 +24903,7 @@
+@@ -33264,9 +24908,7 @@
if test $have_papi = yes; then
@@ -27529,7 +27478,7 @@
fi
if test $have_papi = yes; then
-@@ -33275,13 +24915,9 @@
+@@ -33278,13 +24920,9 @@
fi
if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
@@ -27545,7 +27494,7 @@
fi
fi
-@@ -33294,298 +24930,28 @@
+@@ -33297,298 +24935,28 @@
fi
@@ -27860,7 +27809,7 @@
fi
-@@ -33595,7 +24961,7 @@
+@@ -33598,7 +24966,7 @@
# Check whether --enable-test-print-backend was given.
@@ -27869,7 +27818,7 @@
enableval=$enable_test_print_backend;
else
enable_test_print_backend=no
-@@ -33642,9 +25008,9 @@
+@@ -33645,9 +25013,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -27881,7 +27830,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -33657,14 +25023,14 @@
+@@ -33660,14 +25028,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -27899,7 +27848,7 @@
IFS=$as_save_IFS
;;
-@@ -33672,10 +25038,10 @@
+@@ -33675,10 +25043,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -27912,7 +27861,7 @@
$as_echo "no" >&6; }
fi
-@@ -33684,9 +25050,9 @@
+@@ -33687,9 +25055,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
@@ -27924,7 +27873,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -33699,14 +25065,14 @@
+@@ -33702,14 +25070,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -27942,7 +27891,7 @@
IFS=$as_save_IFS
;;
-@@ -33714,10 +25080,10 @@
+@@ -33717,10 +25085,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -27955,7 +27904,7 @@
$as_echo "no" >&6; }
fi
-@@ -33728,9 +25094,9 @@
+@@ -33731,9 +25099,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -27967,7 +27916,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -33743,14 +25109,14 @@
+@@ -33746,14 +25114,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -27985,7 +27934,7 @@
IFS=$as_save_IFS
;;
-@@ -33758,10 +25124,10 @@
+@@ -33761,10 +25129,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -27998,7 +27947,7 @@
$as_echo "no" >&6; }
fi
-@@ -33769,7 +25135,7 @@
+@@ -33772,7 +25140,7 @@
# Check whether --with-html-dir was given.
@@ -28007,7 +27956,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -33779,7 +25145,7 @@
+@@ -33782,7 +25150,7 @@
# Check whether --enable-gtk-doc was given.
@@ -28016,7 +27965,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -33788,33 +25154,31 @@
+@@ -33791,33 +25159,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -28058,7 +28007,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -33870,9 +25234,9 @@
+@@ -33873,9 +25239,9 @@
# Extract the first word of "db2html", so it can be a program name with args.
set dummy db2html; ac_word=$2
@@ -28070,7 +28019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DB2HTML"; then
-@@ -33883,14 +25247,14 @@
+@@ -33886,14 +25252,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -28088,7 +28037,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false"
-@@ -33898,10 +25262,10 @@
+@@ -33901,10 +25267,10 @@
fi
DB2HTML=$ac_cv_prog_DB2HTML
if test -n "$DB2HTML"; then
@@ -28101,7 +28050,7 @@
$as_echo "no" >&6; }
fi
-@@ -33916,7 +25280,7 @@
+@@ -33919,7 +25285,7 @@
# Check whether --enable-man was given.
@@ -28110,7 +28059,7 @@
enableval=$enable_man; enable_man=yes
else
enable_man=no
-@@ -33926,9 +25290,9 @@
+@@ -33929,9 +25295,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
@@ -28122,7 +28071,7 @@
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -33941,14 +25305,14 @@
+@@ -33944,14 +25310,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -28140,7 +28089,7 @@
IFS=$as_save_IFS
;;
-@@ -33956,10 +25320,10 @@
+@@ -33959,10 +25325,10 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -28153,7 +28102,7 @@
$as_echo "no" >&6; }
fi
-@@ -33972,7 +25336,7 @@
+@@ -33975,7 +25341,7 @@
# check for the presence of the XML catalog
# Check whether --with-xml-catalog was given.
@@ -28162,7 +28111,7 @@
withval=$with_xml_catalog;
else
with_xml_catalog=/etc/xml/catalog
-@@ -33981,23 +25345,23 @@
+@@ -33984,23 +25350,23 @@
jh_found_xmlcatalog=true
XML_CATALOG_FILE="$with_xml_catalog"
@@ -28191,7 +28140,7 @@
$as_echo_n "(cached) " >&6
else
case $XMLCATALOG in
-@@ -34010,14 +25374,14 @@
+@@ -34013,14 +25379,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -28209,7 +28158,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -34026,10 +25390,10 @@
+@@ -34029,10 +25395,10 @@
fi
XMLCATALOG=$ac_cv_path_XMLCATALOG
if test -n "$XMLCATALOG"; then
@@ -28222,7 +28171,7 @@
$as_echo "no" >&6; }
fi
-@@ -34045,35 +25409,35 @@
+@@ -34048,35 +25414,35 @@
fi
@@ -28270,7 +28219,7 @@
$as_echo "not found" >&6; }
enable_man=no
fi
-@@ -34127,13 +25491,13 @@
+@@ -34130,13 +25496,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -28286,7 +28235,7 @@
esac ;;
esac
done
-@@ -34141,8 +25505,8 @@
+@@ -34144,8 +25510,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -28297,7 +28246,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -34165,11 +25529,11 @@
+@@ -34168,11 +25534,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" &&
@@ -28311,7 +28260,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -34189,8 +25553,8 @@
+@@ -34192,8 +25558,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.
@@ -28322,7 +28271,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -34206,580 +25570,342 @@
+@@ -34209,580 +25575,342 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -29072,7 +29021,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -34789,17 +25915,18 @@
+@@ -34792,17 +25920,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -29098,7 +29047,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -34807,23 +25934,15 @@
+@@ -34810,23 +25939,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -29127,7 +29076,7 @@
as_nl='
'
export as_nl
-@@ -34831,7 +25950,13 @@
+@@ -34834,7 +25955,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
@@ -29142,7 +29091,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -34842,7 +25967,7 @@
+@@ -34845,7 +25972,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -29151,7 +29100,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -34865,13 +25990,6 @@
+@@ -34868,13 +25995,6 @@
}
fi
@@ -29165,7 +29114,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -34881,15 +25999,15 @@
+@@ -34884,15 +26004,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -29184,7 +29133,7 @@
IFS=$as_save_IFS
;;
-@@ -34901,12 +26019,16 @@
+@@ -34904,12 +26024,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -29205,7 +29154,7 @@
done
PS1='$ '
PS2='> '
-@@ -34918,7 +26040,89 @@
+@@ -34921,7 +26045,89 @@
LANGUAGE=C
export LANGUAGE
@@ -29296,7 +29245,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -34932,8 +26136,12 @@
+@@ -34935,8 +26141,12 @@
as_basename=false
fi
@@ -29310,7 +29259,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -34953,76 +26161,25 @@
+@@ -34956,76 +26166,25 @@
}
s/.*/./; q'`
@@ -29398,7 +29347,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -35051,8 +26208,56 @@
+@@ -35054,8 +26213,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -29456,7 +29405,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -35071,10 +26276,10 @@
+@@ -35074,10 +26281,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -29469,7 +29418,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -35089,13 +26294,19 @@
+@@ -35092,13 +26299,19 @@
exec 6>&1
@@ -29485,13 +29434,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.18.6, which was
+ This file was extended by gtk+ $as_me 2.18.7, 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
-@@ -35127,13 +26338,15 @@
+@@ -35130,13 +26343,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -29510,7 +29459,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -35152,16 +26365,17 @@
+@@ -35155,16 +26370,17 @@
Configuration commands:
$config_commands
@@ -29521,7 +29470,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.18.6
+ gtk+ config.status 2.18.7
-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,
@@ -29532,7 +29481,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -35197,6 +26411,8 @@
+@@ -35200,6 +26416,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -29541,7 +29490,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -35204,20 +26420,19 @@
+@@ -35207,20 +26425,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -29566,7 +29515,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -35225,11 +26440,10 @@
+@@ -35228,11 +26445,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -29581,7 +29530,7 @@
ac_need_defaults=false ;;
esac
-@@ -35744,9 +26958,7 @@
+@@ -35747,9 +26963,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" ;;
@@ -29592,7 +29541,7 @@
esac
done
-@@ -35773,7 +26985,7 @@
+@@ -35776,7 +26990,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -29601,7 +29550,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -35784,11 +26996,7 @@
+@@ -35787,11 +27001,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -29614,7 +29563,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -35796,10 +27004,16 @@
+@@ -35799,10 +27009,16 @@
if test -n "$CONFIG_FILES"; then
@@ -29633,7 +29582,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -35813,24 +27027,18 @@
+@@ -35816,24 +27032,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -29661,7 +29610,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -35852,7 +27060,7 @@
+@@ -35855,7 +27065,7 @@
t delim
:nl
h
@@ -29670,7 +29619,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -35866,7 +27074,7 @@
+@@ -35869,7 +27079,7 @@
t nl
:delim
h
@@ -29679,7 +29628,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -35919,9 +27127,7 @@
+@@ -35922,9 +27132,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -29690,7 +29639,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -35962,9 +27168,7 @@
+@@ -35965,9 +27173,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -29701,7 +29650,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -36049,9 +27253,7 @@
+@@ -36052,9 +27258,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -29712,7 +29661,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -36064,9 +27266,7 @@
+@@ -36067,9 +27271,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -29723,7 +29672,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -36094,12 +27294,10 @@
+@@ -36097,12 +27299,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -29738,7 +29687,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -36110,7 +27308,7 @@
+@@ -36113,7 +27313,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -29747,7 +29696,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -36123,9 +27321,7 @@
+@@ -36126,9 +27326,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -29758,7 +29707,7 @@
esac
;;
esac
-@@ -36153,47 +27349,7 @@
+@@ -36156,47 +27354,7 @@
q
}
s/.*/./; q'`
@@ -29807,7 +29756,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -36250,7 +27406,6 @@
+@@ -36253,7 +27411,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=
@@ -29815,7 +29764,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -36260,12 +27415,11 @@
+@@ -36263,12 +27420,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -29830,7 +29779,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
-@@ -36275,7 +27429,7 @@
+@@ -36278,7 +27434,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -29839,7 +29788,7 @@
esac
_ACEOF
-@@ -36304,14 +27458,12 @@
+@@ -36307,14 +27463,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -29856,7 +29805,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;}
-@@ -36321,9 +27473,7 @@
+@@ -36324,9 +27478,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -29867,7 +29816,7 @@
;;
:H)
#
-@@ -36334,25 +27484,19 @@
+@@ -36337,25 +27489,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -29897,7 +29846,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -36390,7 +27534,7 @@
+@@ -36393,7 +27539,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -29906,7 +29855,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -36485,47 +27629,7 @@
+@@ -36488,47 +27634,7 @@
q
}
s/.*/./; q'`
@@ -29955,7 +29904,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -37388,7 +28492,7 @@
+@@ -37391,7 +28497,7 @@
if cmp -s $outfile gdk/gdkconfig.h; then
@@ -29964,7 +29913,7 @@
$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;}
rm -f $outfile
else
-@@ -37400,15 +28504,12 @@
+@@ -37403,15 +28509,12 @@
done # for ac_tag
@@ -29982,7 +29931,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -37429,10 +28530,10 @@
+@@ -37432,10 +28535,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.
@@ -29995,15 +29944,8 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur gtk+2.0-2.18.6.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.18.6/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.18.6.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/contrib/gdk-pixbuf-xlib/Makefile.in 2010-01-15 10:40:29.495814222 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/contrib/gdk-pixbuf-xlib/Makefile.in
++++ b/contrib/gdk-pixbuf-xlib/Makefile.in
@@ -48,7 +48,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30013,7 +29955,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc
CONFIG_CLEAN_VPATH_FILES =
-@@ -197,6 +197,7 @@
+@@ -198,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@
@@ -30021,7 +29963,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -275,6 +276,7 @@
+@@ -276,6 +277,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30029,16 +29971,117 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/contrib/Makefile.in gtk+2.0-2.18.6/contrib/Makefile.in
---- gtk+2.0-2.18.6.old/contrib/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/contrib/Makefile.in 2010-01-15 10:40:29.247814115 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
@@ -44,7 +44,7 @@
+ $(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 +171,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@
+@@ -249,6 +250,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@
+--- a/demos/gtk-demo/Makefile.in
++++ b/demos/gtk-demo/Makefile.in
+@@ -46,7 +46,7 @@
+ $(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 +206,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@
+@@ -284,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@
+--- a/demos/Makefile.in
++++ b/demos/Makefile.in
+@@ -50,7 +50,7 @@
+ $(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 =
+@@ -226,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@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -304,6 +305,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@
+--- a/docs/faq/Makefile.in
++++ b/docs/faq/Makefile.in
+@@ -43,7 +43,7 @@
+ $(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 +130,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@
+@@ -208,6 +209,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@
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -30063,205 +30106,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -411,7 +413,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -436,7 +438,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.6/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.18.6.old/demos/gtk-demo/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/demos/gtk-demo/Makefile.in 2010-01-15 10:40:29.975815592 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -46,7 +46,7 @@
- $(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 =
-@@ -205,6 +205,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@
-@@ -283,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.18.6.old/demos/Makefile.in gtk+2.0-2.18.6/demos/Makefile.in
---- gtk+2.0-2.18.6.old/demos/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/demos/Makefile.in 2010-01-15 10:40:29.723814697 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -50,7 +50,7 @@
- $(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 =
-@@ -225,6 +225,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@
-@@ -303,6 +304,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@
-@@ -579,7 +581,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -604,7 +606,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/docs/faq/Makefile.in gtk+2.0-2.18.6/docs/faq/Makefile.in
---- gtk+2.0-2.18.6.old/docs/faq/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/faq/Makefile.in 2010-01-15 10:40:30.323815257 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- $(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 +129,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@
-@@ -207,6 +208,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.18.6.old/docs/Makefile.in gtk+2.0-2.18.6/docs/Makefile.in
---- gtk+2.0-2.18.6.old/docs/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/Makefile.in 2010-01-15 10:40:30.131815437 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- $(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 +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@
-@@ -247,6 +248,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@
-@@ -414,7 +416,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -439,7 +441,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/docs/reference/gdk/Makefile.in gtk+2.0-2.18.6/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.18.6.old/docs/reference/gdk/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/reference/gdk/Makefile.in 2010-01-15 10:40:30.943815225 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/docs/reference/gdk/Makefile.in
++++ b/docs/reference/gdk/Makefile.in
@@ -50,7 +50,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30270,6 +30116,87 @@
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -137,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@
+@@ -215,6 +216,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@
+--- a/docs/reference/gdk-pixbuf/Makefile.in
++++ b/docs/reference/gdk-pixbuf/Makefile.in
+@@ -50,7 +50,7 @@
+ $(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 = version.xml
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -162,6 +162,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 +241,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@
+--- a/docs/reference/gtk/Makefile.in
++++ b/docs/reference/gtk/Makefile.in
+@@ -50,7 +50,7 @@
+ $(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 = version.xml
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -162,6 +162,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 +241,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@
+--- a/docs/reference/libgail-util/Makefile.in
++++ b/docs/reference/libgail-util/Makefile.in
+@@ -49,7 +49,7 @@
+ $(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 +136,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
@@ -30287,117 +30214,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.18.6/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.18.6.old/docs/reference/gdk-pixbuf/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/reference/gdk-pixbuf/Makefile.in 2010-01-15 10:40:30.739814148 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -50,7 +50,7 @@
- $(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 = version.xml
- CONFIG_CLEAN_VPATH_FILES =
-@@ -161,6 +161,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 +240,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.18.6.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.6/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.18.6.old/docs/reference/gtk/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/reference/gtk/Makefile.in 2010-01-15 10:40:31.191815795 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -50,7 +50,7 @@
- $(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 = version.xml
- CONFIG_CLEAN_VPATH_FILES =
-@@ -161,6 +161,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 +240,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.18.6.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.18.6/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.18.6.old/docs/reference/libgail-util/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/reference/libgail-util/Makefile.in 2010-01-15 10:40:31.375815024 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -49,7 +49,7 @@
- $(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 =
-@@ -135,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@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -213,6 +214,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.18.6.old/docs/reference/Makefile.in gtk+2.0-2.18.6/docs/reference/Makefile.in
---- gtk+2.0-2.18.6.old/docs/reference/Makefile.in 2010-01-11 22:11:26.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/reference/Makefile.in 2010-01-15 10:40:30.503814470 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/docs/reference/Makefile.in
++++ b/docs/reference/Makefile.in
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30407,7 +30225,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +169,7 @@
+@@ -170,6 +170,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@
@@ -30415,7 +30233,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -247,6 +248,7 @@
+@@ -248,6 +249,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30423,33 +30241,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -411,7 +413,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -436,7 +438,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/docs/tools/Makefile.in gtk+2.0-2.18.6/docs/tools/Makefile.in
---- gtk+2.0-2.18.6.old/docs/tools/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/tools/Makefile.in 2010-01-15 10:40:31.515814041 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/docs/tools/Makefile.in
++++ b/docs/tools/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30459,7 +30252,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -165,6 +165,7 @@
+@@ -166,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@
@@ -30467,7 +30260,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -243,6 +244,7 @@
+@@ -244,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30475,15 +30268,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/docs/tutorial/Makefile.in gtk+2.0-2.18.6/docs/tutorial/Makefile.in
---- gtk+2.0-2.18.6.old/docs/tutorial/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/docs/tutorial/Makefile.in 2010-01-15 10:40:31.611814922 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/docs/tutorial/Makefile.in
++++ b/docs/tutorial/Makefile.in
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30493,7 +30279,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -129,6 +129,7 @@
+@@ -130,6 +130,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@
@@ -30501,7 +30287,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -207,6 +208,7 @@
+@@ -208,6 +209,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30509,15 +30295,62 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/gdk/directfb/Makefile.in gtk+2.0-2.18.6/gdk/directfb/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/directfb/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/directfb/Makefile.in 2010-01-15 10:40:32.527814169 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/gdk/directfb/Makefile.in
++++ b/gdk/directfb/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 +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@
+@@ -272,6 +273,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@
+--- a/gdk/Makefile.in
++++ b/gdk/Makefile.in
+@@ -46,7 +46,7 @@
+ $(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 =
+@@ -316,6 +316,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@
+@@ -394,6 +395,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@
+--- a/gdk/quartz/Makefile.in
++++ b/gdk/quartz/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30543,15 +30376,160 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/gdk/Makefile.in gtk+2.0-2.18.6/gdk/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/Makefile.in 2010-01-15 10:40:32.395814915 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/gdk/tests/Makefile.in
++++ b/gdk/tests/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 =
+@@ -135,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@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -213,6 +214,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@
+--- a/gdk/win32/Makefile.in
++++ b/gdk/win32/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 =
+@@ -231,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@
+@@ -309,6 +310,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@
+--- a/gdk/win32/rc/Makefile.in
++++ b/gdk/win32/rc/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 = gdk.rc
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -132,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@
+@@ -210,6 +211,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@
+--- a/gdk/x11/Makefile.in
++++ b/gdk/x11/Makefile.in
+@@ -50,7 +50,7 @@
+ $(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 =
+@@ -223,6 +223,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@
+@@ -301,6 +302,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@
+--- a/gdk-pixbuf/Makefile.in
++++ b/gdk-pixbuf/Makefile.in
+@@ -52,7 +52,7 @@
+ $(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 = gdk_pixbuf.rc gdk-pixbuf-features.h
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -753,6 +753,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@
+@@ -831,6 +832,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@
+@@ -963,6 +965,7 @@
+ libgdk_pixbuf-2.0.la
+
+ loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
+ module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+
+ #
+@@ -1322,7 +1325,7 @@
+ $(GDK_PIXBUF_DEP_CFLAGS) \
+ -DGDK_PIXBUF_ENABLE_BACKEND
+
+-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+--- a/gdk-pixbuf/pixops/Makefile.in
++++ b/gdk-pixbuf/pixops/Makefile.in
@@ -46,7 +46,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30561,7 +30539,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -315,6 +315,7 @@
+@@ -183,6 +183,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@
@@ -30569,7 +30547,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -393,6 +394,7 @@
+@@ -261,6 +262,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30577,324 +30555,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -856,7 +858,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -881,7 +883,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/gdk/quartz/Makefile.in gtk+2.0-2.18.6/gdk/quartz/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/quartz/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/quartz/Makefile.in 2010-01-15 10:40:32.643814866 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +192,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@
-@@ -270,6 +271,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.18.6.old/gdk/tests/Makefile.in gtk+2.0-2.18.6/gdk/tests/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/tests/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/tests/Makefile.in 2010-01-15 10:40:32.751814347 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +134,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@
-@@ -212,6 +213,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.18.6.old/gdk/win32/Makefile.in gtk+2.0-2.18.6/gdk/win32/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/win32/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/win32/Makefile.in 2010-01-15 10:40:32.891814338 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +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@
-@@ -308,6 +309,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@
-@@ -614,7 +616,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -639,7 +641,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/gdk/win32/rc/Makefile.in gtk+2.0-2.18.6/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/win32/rc/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/win32/rc/Makefile.in 2010-01-15 10:40:32.991814344 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
- $(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 = gdk.rc
- CONFIG_CLEAN_VPATH_FILES =
-@@ -131,6 +131,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@
-@@ -209,6 +210,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.18.6.old/gdk/x11/Makefile.in gtk+2.0-2.18.6/gdk/x11/Makefile.in
---- gtk+2.0-2.18.6.old/gdk/x11/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk/x11/Makefile.in 2010-01-15 10:40:33.147814955 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -50,7 +50,7 @@
- $(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 =
-@@ -222,6 +222,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@
-@@ -300,6 +301,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.18.6.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.6/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.18.6.old/gdk-pixbuf/Makefile.in 2010-01-11 22:11:27.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk-pixbuf/Makefile.in 2010-01-15 10:40:31.987814603 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -52,7 +52,7 @@
- $(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 = gdk_pixbuf.rc gdk-pixbuf-features.h
- CONFIG_CLEAN_VPATH_FILES =
-@@ -752,6 +752,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@
-@@ -830,6 +831,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@
-@@ -962,6 +964,7 @@
- libgdk_pixbuf-2.0.la
-
- loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
-+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
- module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
-
- #
-@@ -1321,7 +1324,7 @@
- $(GDK_PIXBUF_DEP_CFLAGS) \
- -DGDK_PIXBUF_ENABLE_BACKEND
-
--AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
-+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-@@ -1766,7 +1769,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -1791,7 +1794,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.18.6/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.18.6.old/gdk-pixbuf/pixops/Makefile.in 2010-01-11 22:11:28.000000000 +0100
-+++ gtk+2.0-2.18.6/gdk-pixbuf/pixops/Makefile.in 2010-01-15 10:40:32.227814574 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -46,7 +46,7 @@
- $(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 =
-@@ -182,6 +182,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@
-@@ -260,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.18.6.old/gtk/Makefile.in gtk+2.0-2.18.6/gtk/Makefile.in
---- gtk+2.0-2.18.6.old/gtk/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/gtk/Makefile.in 2010-01-15 10:40:33.735816782 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/gtk/Makefile.in
++++ b/gtk/Makefile.in
@@ -79,7 +79,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30904,7 +30566,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -728,6 +728,7 @@
+@@ -729,6 +729,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@
@@ -30912,7 +30574,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -806,6 +807,7 @@
+@@ -807,6 +808,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30920,7 +30582,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -959,6 +961,8 @@
+@@ -960,6 +962,8 @@
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
@@ -30929,7 +30591,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -1070,17 +1074,21 @@
+@@ -1071,17 +1075,21 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -30959,33 +30621,8 @@
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
-@@ -2097,7 +2105,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -2122,7 +2130,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/gtk/tests/Makefile.in gtk+2.0-2.18.6/gtk/tests/Makefile.in
---- gtk+2.0-2.18.6.old/gtk/tests/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/gtk/tests/Makefile.in 2010-01-15 10:40:33.999814173 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/gtk/tests/Makefile.in
++++ b/gtk/tests/Makefile.in
@@ -46,7 +46,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -30995,7 +30632,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -220,6 +220,7 @@
+@@ -221,6 +221,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@
@@ -31003,7 +30640,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -298,6 +299,7 @@
+@@ -299,6 +300,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31011,15 +30648,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/gtk/theme-bits/Makefile.in gtk+2.0-2.18.6/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.18.6.old/gtk/theme-bits/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/gtk/theme-bits/Makefile.in 2010-01-15 10:40:34.199814158 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/gtk/theme-bits/Makefile.in
++++ b/gtk/theme-bits/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31029,7 +30659,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -162,6 +162,7 @@
+@@ -163,6 +163,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@
@@ -31037,7 +30667,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -240,6 +241,7 @@
+@@ -241,6 +242,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31045,9 +30675,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/ltmain.sh gtk+2.0-2.18.6/ltmain.sh
---- gtk+2.0-2.18.6.old/ltmain.sh 2009-12-02 12:35:38.000000000 +0100
-+++ gtk+2.0-2.18.6/ltmain.sh 2010-01-15 10:40:20.167814702 +0100
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -31126,15 +30755,8 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.18.6.old/m4macros/Makefile.in gtk+2.0-2.18.6/m4macros/Makefile.in
---- gtk+2.0-2.18.6.old/m4macros/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/m4macros/Makefile.in 2010-01-15 10:40:34.343813748 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/m4macros/Makefile.in
++++ b/m4macros/Makefile.in
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31144,7 +30766,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -153,6 +153,7 @@
+@@ -154,6 +154,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@
@@ -31152,7 +30774,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -231,6 +232,7 @@
+@@ -232,6 +233,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31160,15 +30782,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/Makefile.in gtk+2.0-2.18.6/Makefile.in
---- gtk+2.0-2.18.6.old/Makefile.in 2010-01-11 22:11:32.000000000 +0100
-+++ gtk+2.0-2.18.6/Makefile.in 2010-01-15 10:40:38.519816015 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/Makefile.in
++++ b/Makefile.in
@@ -47,7 +47,7 @@
$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
@@ -31197,7 +30812,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -219,6 +220,7 @@
+@@ -220,6 +221,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@
@@ -31205,7 +30820,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -297,6 +299,7 @@
+@@ -298,6 +300,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31213,7 +30828,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -467,7 +470,10 @@
+@@ -468,7 +471,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -31225,59 +30840,8 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -633,7 +639,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -658,7 +664,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -825,8 +831,7 @@
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -755 \
-- -exec chmod u+rwx,go+rx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -870,17 +875,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff -Naur gtk+2.0-2.18.6.old/mkinstalldirs gtk+2.0-2.18.6/mkinstalldirs
---- gtk+2.0-2.18.6.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.18.6/mkinstalldirs 2010-01-15 10:40:38.455816679 +0100
+--- /dev/null
++++ b/mkinstalldirs
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -31441,304 +31005,9 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.18.6.old/modules/engines/Makefile.in gtk+2.0-2.18.6/modules/engines/Makefile.in
---- gtk+2.0-2.18.6.old/modules/engines/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/engines/Makefile.in 2010-01-15 10:40:34.551814843 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/modules/engines/Makefile.in
++++ b/modules/engines/Makefile.in
@@ -43,7 +43,7 @@
- $(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 +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@
-@@ -247,6 +248,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@
-@@ -411,7 +413,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -436,7 +438,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.18.6/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.18.6.old/modules/engines/ms-windows/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/engines/ms-windows/Makefile.in 2010-01-15 10:40:34.667814702 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
- $(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 +227,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@
-@@ -305,6 +306,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@
-@@ -566,7 +568,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -591,7 +593,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.18.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.18.6.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-01-15 10:40:34.851815047 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
- $(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 +153,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@
-@@ -231,6 +232,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.18.6.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.18.6/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.18.6.old/modules/engines/ms-windows/Theme/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/engines/ms-windows/Theme/Makefile.in 2010-01-15 10:40:34.759814316 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- $(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 +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@
-@@ -247,6 +248,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@
-@@ -410,7 +412,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -435,7 +437,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.18.6/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.18.6.old/modules/engines/pixbuf/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/engines/pixbuf/Makefile.in 2010-01-15 10:40:35.031814678 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
- $(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 +190,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@
-@@ -268,6 +269,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.18.6.old/modules/input/Makefile.in gtk+2.0-2.18.6/modules/input/Makefile.in
---- gtk+2.0-2.18.6.old/modules/input/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/input/Makefile.in 2010-01-15 10:40:35.267814144 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +391,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@
-@@ -469,6 +470,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@
-@@ -705,7 +707,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) \
-@@ -1257,7 +1260,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.18.6.old/modules/Makefile.in gtk+2.0-2.18.6/modules/Makefile.in
---- gtk+2.0-2.18.6.old/modules/Makefile.in 2010-01-11 22:11:29.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/Makefile.in 2010-01-15 10:40:34.459815093 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -31763,34 +31032,309 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -411,7 +413,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -436,7 +438,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.18.6/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.18.6.old/modules/other/gail/libgail-util/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/other/gail/libgail-util/Makefile.in 2010-01-15 10:40:35.983813885 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/modules/engines/ms-windows/Makefile.in
++++ b/modules/engines/ms-windows/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 +228,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@
+@@ -306,6 +307,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@
+--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 +154,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@
+@@ -232,6 +233,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@
+--- a/modules/engines/ms-windows/Theme/Makefile.in
++++ b/modules/engines/ms-windows/Theme/Makefile.in
+@@ -43,7 +43,7 @@
+ $(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 +170,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@
+@@ -248,6 +249,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@
+--- a/modules/engines/pixbuf/Makefile.in
++++ b/modules/engines/pixbuf/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 +191,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@
+@@ -269,6 +270,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@
+--- a/modules/input/Makefile.in
++++ b/modules/input/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 +392,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@
+@@ -470,6 +471,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@
+@@ -706,7 +708,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) \
+@@ -1258,7 +1261,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
+
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 +171,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@
+@@ -249,6 +250,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@
+--- a/modules/other/gail/libgail-util/Makefile.in
++++ b/modules/other/gail/libgail-util/Makefile.in
@@ -46,7 +46,7 @@
+ $(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 +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@
+@@ -273,6 +274,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@
+--- a/modules/other/gail/Makefile.in
++++ b/modules/other/gail/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 +262,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@
+@@ -340,6 +341,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@
+--- a/modules/other/gail/tests/Makefile.in
++++ b/modules/other/gail/tests/Makefile.in
+@@ -44,7 +44,7 @@
+ $(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 +334,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@
+@@ -412,6 +413,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@
+--- a/modules/other/Makefile.in
++++ b/modules/other/Makefile.in
+@@ -43,7 +43,7 @@
+ $(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 +170,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@
+@@ -248,6 +249,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@
+--- a/modules/printbackends/cups/Makefile.in
++++ b/modules/printbackends/cups/Makefile.in
+@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -31815,153 +31359,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/modules/other/gail/Makefile.in gtk+2.0-2.18.6/modules/other/gail/Makefile.in
---- gtk+2.0-2.18.6.old/modules/other/gail/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/other/gail/Makefile.in 2010-01-15 10:40:35.759815503 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +261,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@
-@@ -339,6 +340,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@
-@@ -1253,7 +1255,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -1278,7 +1280,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.18.6/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.18.6.old/modules/other/gail/tests/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/other/gail/tests/Makefile.in 2010-01-15 10:40:36.271813814 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -44,7 +44,7 @@
- $(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 +333,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@
-@@ -411,6 +412,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.18.6.old/modules/other/Makefile.in gtk+2.0-2.18.6/modules/other/Makefile.in
---- gtk+2.0-2.18.6.old/modules/other/Makefile.in 2010-01-11 22:11:30.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/other/Makefile.in 2010-01-15 10:40:35.359813967 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- $(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 +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@
-@@ -247,6 +248,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@
-@@ -410,7 +412,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -435,7 +437,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.18.6/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/cups/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/cups/Makefile.in 2010-01-15 10:40:36.591814826 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/modules/printbackends/file/Makefile.in
++++ b/modules/printbackends/file/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -31987,15 +31386,89 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/modules/printbackends/file/Makefile.in gtk+2.0-2.18.6/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/file/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/file/Makefile.in 2010-01-15 10:40:36.723814837 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/modules/printbackends/lpr/Makefile.in
++++ b/modules/printbackends/lpr/Makefile.in
+@@ -45,7 +45,7 @@
+ $(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 +191,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@
+@@ -269,6 +270,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@
+--- a/modules/printbackends/Makefile.in
++++ b/modules/printbackends/Makefile.in
+@@ -46,7 +46,7 @@
+ $(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 +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@
+@@ -250,6 +251,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@
+--- a/modules/printbackends/papi/Makefile.in
++++ b/modules/printbackends/papi/Makefile.in
+@@ -43,7 +43,7 @@
+ $(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 +191,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@
+@@ -269,6 +270,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@
+--- a/modules/printbackends/test/Makefile.in
++++ b/modules/printbackends/test/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32021,15 +31494,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.18.6/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/lpr/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/lpr/Makefile.in 2010-01-15 10:40:36.899814867 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/perf/Makefile.in
++++ b/perf/Makefile.in
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32039,7 +31505,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -190,6 +190,7 @@
+@@ -166,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@
@@ -32047,7 +31513,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -268,6 +269,7 @@
+@@ -244,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32055,163 +31521,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.18.6.old/modules/printbackends/Makefile.in gtk+2.0-2.18.6/modules/printbackends/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/Makefile.in 2010-01-15 10:40:36.435814066 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -46,7 +46,7 @@
- $(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 +171,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@
-@@ -249,6 +250,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@
-@@ -413,7 +415,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -438,7 +440,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -Naur gtk+2.0-2.18.6.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.18.6/modules/printbackends/papi/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/papi/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/papi/Makefile.in 2010-01-15 10:40:37.139815126 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -43,7 +43,7 @@
- $(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 +190,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@
-@@ -268,6 +269,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.18.6.old/modules/printbackends/test/Makefile.in gtk+2.0-2.18.6/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.18.6.old/modules/printbackends/test/Makefile.in 2010-01-11 22:11:31.000000000 +0100
-+++ gtk+2.0-2.18.6/modules/printbackends/test/Makefile.in 2010-01-15 10:40:37.403815164 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +191,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@
-@@ -269,6 +270,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.18.6.old/perf/Makefile.in gtk+2.0-2.18.6/perf/Makefile.in
---- gtk+2.0-2.18.6.old/perf/Makefile.in 2010-01-11 22:11:32.000000000 +0100
-+++ gtk+2.0-2.18.6/perf/Makefile.in 2010-01-15 10:40:37.679815389 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,7 @@
- $(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 +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@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -243,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.18.6.old/po/Makefile.in.in gtk+2.0-2.18.6/po/Makefile.in.in
---- gtk+2.0-2.18.6.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
-+++ gtk+2.0-2.18.6/po/Makefile.in.in 2010-01-15 10:40:21.039817301 +0100
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -25,22 +25,23 @@
prefix = @prefix@
@@ -32323,15 +31634,8 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-diff -Naur gtk+2.0-2.18.6.old/tests/Makefile.in gtk+2.0-2.18.6/tests/Makefile.in
---- gtk+2.0-2.18.6.old/tests/Makefile.in 2010-01-11 22:11:32.000000000 +0100
-+++ gtk+2.0-2.18.6/tests/Makefile.in 2010-01-15 10:40:38.351816931 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
@@ -79,7 +79,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -32341,7 +31645,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -427,6 +427,7 @@
+@@ -428,6 +428,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@
@@ -32349,7 +31653,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -505,6 +506,7 @@
+@@ -506,6 +507,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32357,3 +31661,767 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
+--- a/INSTALL
++++ b/INSTALL
+@@ -1,41 +1,365 @@
+-Prerequisites
+-=============
++Installation Instructions
++*************************
+
+-GTK+ requires the following packages:
++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+- - The GLib, Pango, ATK and cairo libraries, available at the same
+- location as GTK+. GTK+ 2.18.7 requires at least GLib 2.17.6,
+- Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
++
++Basic Installation
++==================
++
++ Briefly, the shell commands `./configure; make; make install' should
++configure, build, and install this package. The following
++more-detailed instructions are generic; see the `README' file for
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
++
++ The `configure' shell script attempts to guess correct values for
++various system-dependent variables used during compilation. It uses
++those values to create a `Makefile' in each directory of the package.
++It may also create one or more `.h' files containing system-dependent
++definitions. Finally, it creates a shell script `config.status' that
++you can run in the future to recreate the current configuration, and a
++file `config.log' containing compiler output (useful mainly for
++debugging `configure').
++
++ It can also use an optional file (typically called `config.cache'
++and enabled with `--cache-file=config.cache' or simply `-C') that saves
++the results of its tests to speed up reconfiguring. Caching is
++disabled by default to prevent problems with accidental use of stale
++cache files.
++
++ If you need to do unusual things to compile the package, please try
++to figure out how `configure' could check whether to do them, and mail
++diffs or instructions to the address given in the `README' so they can
++be considered for the next release. If you are using the cache, and at
++some point `config.cache' contains results you don't want to keep, you
++may remove or edit it.
++
++ The file `configure.ac' (or `configure.in') is used to create
++`configure' by a program called `autoconf'. You need `configure.ac' if
++you want to change it or regenerate `configure' using a newer version
++of `autoconf'.
++
++ The simplest way to compile this package is:
++
++ 1. `cd' to the directory containing the package's source code and type
++ `./configure' to configure the package for your system.
++
++ Running `configure' might take a while. While running, it prints
++ some messages telling which features it is checking for.
++
++ 2. Type `make' to compile the package.
++
++ 3. Optionally, type `make check' to run any self-tests that come with
++ the package, generally using the just-built uninstalled binaries.
++
++ 4. Type `make install' to install the programs and any data files and
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
++
++ 6. You can remove the program binaries and object files from the
++ source code directory by typing `make clean'. To also remove the
++ files that `configure' created (so you can compile the package for
++ a different kind of computer), type `make distclean'. There is
++ also a `make maintainer-clean' target, but that is intended mainly
++ for the package's developers. If you use it, you may have to get
++ all sorts of other programs in order to regenerate files that came
++ with the distribution.
++
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
++
++Compilers and Options
++=====================
++
++ Some systems require unusual options for compilation or linking that
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
++
++ You can give `configure' initial values for configuration parameters
++by setting variables in the command line or in the environment. Here
++is an example:
++
++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
++
++ *Note Defining Variables::, for more details.
++
++Compiling For Multiple Architectures
++====================================
++
++ You can compile the package for more than one kind of computer at the
++same time, by placing the object files for each architecture in their
++own directory. To do this, you can use GNU `make'. `cd' to the
++directory where you want the object files and executables to go and run
++the `configure' script. `configure' automatically checks for the
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
++
++ With a non-GNU `make', it is safer to compile the package for one
++architecture at a time in the source code directory. After you have
++installed the package for one architecture, use `make distclean' before
++reconfiguring for another architecture.
++
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
++Installation Names
++==================
++
++ By default, `make install' installs the package's commands under
++`/usr/local/bin', include files under `/usr/local/include', etc. You
++can specify an installation prefix other than `/usr/local' by giving
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
++
++ You can specify separate installation prefixes for
++architecture-specific files and architecture-independent files. If you
++pass the option `--exec-prefix=PREFIX' to `configure', the package uses
++PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files still use the regular prefix.
++
++ In addition, if you use an unusual directory layout you can give
++options like `--bindir=DIR' to specify different values for particular
++kinds of files. Run `configure --help' for a list of the directories
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
++
++ If the package supports it, you can cause programs to be installed
++with an extra prefix or suffix on their names by giving `configure' the
++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
++
++ Some packages pay attention to `--enable-FEATURE' options to
++`configure', where FEATURE indicates an optional part of the package.
++They may also pay attention to `--with-PACKAGE' options, where PACKAGE
++is something like `gnu-as' or `x' (for the X Window System). The
++`README' should mention any `--enable-' and `--with-' options that the
++package recognizes.
++
++ For packages that use the X Window System, `configure' can usually
++find the X include and library files automatically, but if it doesn't,
++you can use the `configure' options `--x-includes=DIR' and
++`--x-libraries=DIR' to specify their locations.
++
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
++
++Specifying the System Type
++==========================
++
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
++`--build=TYPE' option. TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name which has the form:
++
++ CPU-COMPANY-SYSTEM
++
++where SYSTEM can have one of these forms:
++
++ OS
++ KERNEL-OS
++
++ See the file `config.sub' for the possible values of each field. If
++`config.sub' isn't included in this package, then this package doesn't
++need to know the machine type.
++
++ If you are _building_ compiler tools for cross-compiling, you should
++use the option `--target=TYPE' to select the type of system they will
++produce code for.
++
++ If you want to _use_ a cross compiler, that generates code for a
++platform different from the build platform, you should specify the
++"host" platform (i.e., that on which the generated programs will
++eventually be run) with `--host=TYPE'.
++
++Sharing Defaults
++================
++
++ If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
++`configure' looks for `PREFIX/share/config.site' if it exists, then
++`PREFIX/etc/config.site' if it exists. Or, you can set the
++`CONFIG_SITE' environment variable to the location of the site script.
++A warning: not all `configure' scripts look for a site script.
++
++Defining Variables
++==================
++
++ Variables not defined in a site shell script can be set in the
++environment passed to `configure'. However, some packages may run
++configure again during the build, and the customized values of these
++variables may be lost. In order to avoid this problem, you should set
++them in the `configure' command line, using `VAR=value'. For example:
++
++ ./configure CC=/usr/local2/bin/gcc
++
++causes the specified `gcc' to be used as the C compiler (unless it is
++overridden in the site shell script).
++
++Unfortunately, this technique does not work for `CONFIG_SHELL' due to
++an Autoconf bug. Until the bug is fixed you can use this workaround:
++
++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
++
++`configure' Invocation
++======================
++
++ `configure' recognizes the following options to control how it
++operates.
++
++`--help'
++`-h'
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
++
++`--version'
++`-V'
++ Print the version of Autoconf used to generate the `configure'
++ script, and exit.
++
++`--cache-file=FILE'
++ Enable the cache: use and save the results of the tests in FILE,
++ traditionally `config.cache'. FILE defaults to `/dev/null' to
++ disable caching.
++
++`--config-cache'
++`-C'
++ Alias for `--cache-file=config.cache'.
++
++`--quiet'
++`--silent'
++`-q'
++ Do not print messages saying which checks are being made. To
++ suppress all normal output, redirect it to `/dev/null' (any error
++ messages will still be shown).
++
++`--srcdir=DIR'
++ Look for the package's source code in directory DIR. Usually
++ `configure' can determine that directory automatically.
++
++`--prefix=DIR'
++ Use DIR as the installation prefix. *note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
+
+- - The TIFF, PNG, and JPEG image loading libraries. You most
+- likely have these installed on your system already. If not
+- these libraries are available from:
+-
+- http://www.libtiff.org/
+- http://www.libpng.org/
+- http://www.ijg.org/
+-
+- libtiff must be version 3.6.0 or higher.
+-
+-Simple install procedure
+-========================
+-
+- % gzip -cd gtk+-2.18.7.tar.gz | tar xvf - # unpack the sources
+- % cd gtk+-2.18.7 # change to the toplevel directory
+- % ./configure # run the `configure' script
+- % make # build GTK+
+- [ Become root if necessary ]
+- % make install # install GTK+
+-
+-The Details
+-===========
+-
+-Complete information about installing GTK+ and related libraries can be found
+-in the file:
+-
+- docs/reference/gtk/html/gtk-building.html
+-
+-Or online at:
+-
+- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
++`configure' also accepts some other, not widely useful, options. Run
++`configure --help' for more details.
+
+--- a/config.guess
++++ b/config.guess
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-06-10'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner. Please send patches (context
+-# diff format) to <config-patches at gnu.org> and include a ChangeLog
+-# entry.
++# Originally written by Per Bothner <per at bothner.com>.
++# Please send patches to <config-patches at gnu.org>. Submit a context
++# diff and a properly formatted ChangeLog entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# The plan is that this can be called by configure scripts if you
++# don't specify an explicit build system type.
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -333,9 +333,6 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+- echo i386-pc-auroraux${UNAME_RELEASE}
+- exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -810,12 +807,12 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:*)
++ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- authenticamd | genuineintel | EM64T)
++ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -857,20 +854,6 @@
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -893,17 +876,6 @@
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- LIBC=gnu
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -929,18 +901,39 @@
+ #endif
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^CPU/{
++ s: ::g
++ p
++ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
++ exit ;;
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
+- exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -949,11 +942,8 @@
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -976,6 +966,58 @@
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ # The BFD linker knows what the default object file format is, so
++ # first see if it will tell us. cd to the root directory to prevent
++ # problems with other programs or directories called `ld' in the path.
++ # Set LC_ALL=C to ensure ld outputs messages in English.
++ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++ | sed -ne '/supported targets:/!d
++ s/[ ][ ]*/ /g
++ s/.*supported targets: *//
++ s/ .*//
++ p'`
++ case "$ld_supported_targets" in
++ elf32-i386)
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++ ;;
++ esac
++ # Determine whether the default compiler is a.out or elf
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #include <features.h>
++ #ifdef __ELF__
++ # ifdef __GLIBC__
++ # if __GLIBC__ >= 2
++ LIBC=gnu
++ # else
++ LIBC=gnulibc1
++ # endif
++ # else
++ LIBC=gnulibc1
++ # endif
++ #else
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++ LIBC=gnu
++ #else
++ LIBC=gnuaout
++ #endif
++ #endif
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^LIBC/{
++ s: ::g
++ p
++ }'`"
++ test x"${LIBC}" != x && {
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit
++ }
++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1205,16 +1247,6 @@
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+- i386)
+- eval $set_cc_for_build
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- UNAME_PROCESSOR="x86_64"
+- fi
+- fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+--- a/config.sub
++++ b/config.sub
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-06-11'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,16 +32,13 @@
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted GNU ChangeLog entry.
++# diff and a properly formatted ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
+-# You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+-
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -152,7 +149,7 @@
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray | -microblaze)
++ -apple | -axis | -knuth | -cray)
+ os=
+ basic_machine=$1
+ ;;
+@@ -287,7 +284,6 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+- | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -295,14 +291,13 @@
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+- | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
++ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -345,7 +340,7 @@
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -373,7 +368,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -382,7 +377,6 @@
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tron-* \
+- | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -732,9 +726,6 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+- microblaze)
+- basic_machine=microblaze-xilinx
+- ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1256,9 +1247,6 @@
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+- -auroraux)
+- os=-auroraux
+- ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1280,8 +1268,8 @@
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+- | -sym* | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1302,7 +1290,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
More information about the pkg-gnome-commits
mailing list