r20217 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in patches/070_mandatory-relibtoolize.patch patches/091_workaround_no_gtk_init_incorrect_display.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Jun 2 05:45:12 UTC 2009
Author: slomo
Date: Tue Jun 2 05:45:12 2009
New Revision: 20217
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20217
Log:
* New upstream bugfix release:
+ debian/patches/091_workaround_no_gtk_init_incorrect_display.patch:
- Dropped, merged upstream.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
* debian/control.in:
+ Updated Standards-Version to 3.8.1, no additional changes needed.
Removed:
desktop/unstable/gtk+2.0/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch
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
desktop/unstable/gtk+2.0/debian/patches/series
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=20217&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Tue Jun 2 05:45:12 2009
@@ -1,8 +1,18 @@
-gtk+2.0 (2.16.1-3) UNRELEASED; urgency=low
-
+gtk+2.0 (2.16.2-1) unstable; urgency=low
+
+ [ Loic Minier ]
* Fix string concat in dh_gtkmodules; thanks Kanru Chen; closes: #528782.
- -- Loic Minier <lool at dooz.org> Fri, 15 May 2009 16:59:50 +0200
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/091_workaround_no_gtk_init_incorrect_display.patch:
+ - Dropped, merged upstream.
+ + debian/patches/070_mandatory-relibtoolize.patch:
+ - Regenerated for the new version.
+ * debian/control.in:
+ + Updated Standards-Version to 3.8.1, no additional changes needed.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 02 Jun 2009 07:44:43 +0200
gtk+2.0 (2.16.1-2) unstable; urgency=low
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=20217&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Tue Jun 2 05:45:12 2009
@@ -42,7 +42,7 @@
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
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=20217&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in (original)
+++ desktop/unstable/gtk+2.0/debian/control.in Tue Jun 2 05:45:12 2009
@@ -42,7 +42,7 @@
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
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=20217&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Tue Jun 2 05:45:12 2009
@@ -1,9 +1,9 @@
-diff -Naur gtk+2.0-2.16.1.old/aclocal.m4 gtk+2.0-2.16.1/aclocal.m4
---- gtk+2.0-2.16.1.old/aclocal.m4 2009-04-11 21:55:14.000000000 +0200
-+++ gtk+2.0-2.16.1/aclocal.m4 2009-04-12 11:21:13.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/aclocal.m4 gtk+2.0-2.16.2/aclocal.m4
+--- gtk+2.0-2.16.2.old/aclocal.m4 2009-05-31 06:10:56.000000000 +0200
++++ gtk+2.0-2.16.2/aclocal.m4 2009-06-02 07:42:39.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
@@ -30,7 +30,7 @@
-AC_DIVERT_POP()])])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.63],,
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+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.
@@ -422,6 +422,8 @@
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+-
+-# Copyright 2002 Free Software Foundation, Inc.
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
@@ -455,7 +457,10 @@
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
--# Copyright 2002 Free Software Foundation, Inc.
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+dnl
+dnl We go to great lengths to make sure that aclocal won't
+dnl try to pull in the installed version of these macros
@@ -468,10 +473,10 @@
+dnl definitions in terms of our private definitions.
+dnl
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
@@ -486,10 +491,9 @@
+ fi
+ fi])
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -530,9 +534,11 @@
+AC_SUBST($1)dnl
+])
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
@@ -540,29 +546,28 @@
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
-+ gt_cv_have_gettext=no
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
++ gt_cv_have_gettext=no
+
+-# Helper functions for option handling. -*- Autoconf -*-
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
--# Helper functions for option handling. -*- Autoconf -*-
+-# Copyright 2001, 2002 Free Software Foundation, Inc.
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
--# Copyright 2001, 2002 Free Software Foundation, Inc.
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+ #
+ # First check in libc
+ #
@@ -590,10 +595,10 @@
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+ #
+ # If we don't have everything we want, check in libintl
+ #
@@ -606,10 +611,10 @@
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])])
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
@@ -621,10 +626,7 @@
+ :,-liconv)
+ fi
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-# serial 2
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
@@ -637,7 +639,10 @@
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ LIBS="$glib_save_LIBS"
--# serial 2
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+ gt_cv_func_dgettext_libc=no
+ else
@@ -649,11 +654,6 @@
+ fi
+ fi
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
@@ -2043,7 +2043,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
-@@ -8610,2187 +8029,1736 @@
+@@ -8610,2187 +8029,1745 @@
func_arith_result=`expr "$[@]"`
}
@@ -2602,20 +2602,20 @@
- ;;
-esac
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-AC_SUBST([LIBLTDL])
-AC_SUBST([LTDLDEPS])
-AC_SUBST([LTDLINCL])
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
-# For backwards non-gettext consistent compatibility...
-INCLTDL="$LTDLINCL"
-AC_SUBST([INCLTDL])
-])# LTDL_INSTALLABLE
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
@@ -2623,9 +2623,6 @@
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
-
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-# _LTDL_MODE_DISPATCH
-# -------------------
@@ -2643,14 +2640,9 @@
-dnl Be careful not to expand twice:
-m4_define([$0], [])
-])# _LTDL_MODE_DISPATCH
-
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
-# _LT_LIBOBJ(MODULE_NAME)
-# -----------------------
@@ -2660,20 +2652,19 @@
- m4_pattern_allow([^_LT_LIBOBJS$])
- _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
-])# _LT_LIBOBJS
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++ [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++ [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++ [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
-
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-# LTDL_INIT([OPTIONS])
-# --------------------
@@ -2685,7 +2676,14 @@
-AC_DEFUN([LTDL_INIT],
-[dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-+# serial 6 ltsugar.m4
++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
-dnl We need to keep our own list of libobjs separate from our parent project,
-dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
@@ -2727,6 +2725,8 @@
-AC_ARG_WITH([ltdl_include],
- [AS_HELP_STRING([--with-ltdl-include=DIR],
- [use the ltdl headers installed in DIR])])
++# serial 6 ltsugar.m4
++
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
@@ -3781,7 +3781,7 @@
-[m4_ifval([$3],
- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -3796,7 +3796,7 @@
+[am__api_version='1.10'
+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.10.1], [],
++m4_if([$1], [1.10.2], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
@@ -3816,12 +3816,12 @@
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
++[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
@@ -4444,7 +4444,7 @@
-fi])
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -4464,7 +4464,7 @@
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-+#serial 3
++#serial 4
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
@@ -4479,7 +4479,16 @@
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
++[# Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file. Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*) set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
@@ -5309,7 +5318,7 @@
-# Configure paths for GLIB
-# Owen Taylor 1997-2001
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
@@ -5325,7 +5334,7 @@
-dnl
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-+# serial 3
++# serial 4
- pkg_config_args=glib-2.0
- for module in . $4
@@ -5365,7 +5374,7 @@
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- if test "x$PKG_CONFIG" = x ; then
- no_glib=yes
@@ -5758,12 +5767,12 @@
+]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
-diff -Naur gtk+2.0-2.16.1.old/config.guess gtk+2.0-2.16.1/config.guess
-diff -Naur gtk+2.0-2.16.1.old/config.sub gtk+2.0-2.16.1/config.sub
-diff -Naur gtk+2.0-2.16.1.old/configure gtk+2.0-2.16.1/configure
---- gtk+2.0-2.16.1.old/configure 2009-04-11 21:55:37.000000000 +0200
-+++ gtk+2.0-2.16.1/configure 2009-04-12 11:21:16.000000000 +0200
-@@ -833,6 +833,7 @@
+diff -Naur gtk+2.0-2.16.2.old/config.guess gtk+2.0-2.16.2/config.guess
+diff -Naur gtk+2.0-2.16.2.old/config.sub gtk+2.0-2.16.2/config.sub
+diff -Naur gtk+2.0-2.16.2.old/configure gtk+2.0-2.16.2/configure
+--- gtk+2.0-2.16.2.old/configure 2009-05-31 06:11:09.000000000 +0200
++++ gtk+2.0-2.16.2/configure 2009-06-02 07:42:43.000000000 +0200
+@@ -837,6 +837,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
GDK_EXTRA_LIBS
@@ -5771,7 +5780,7 @@
GDK_PACKAGES
USE_DIRECTFB_FALSE
USE_DIRECTFB_TRUE
-@@ -996,6 +997,9 @@
+@@ -1000,6 +1001,9 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -5781,7 +5790,7 @@
CCASFLAGS
CCAS
CXXCPP
-@@ -1031,6 +1035,8 @@
+@@ -1035,6 +1039,8 @@
CXXFLAGS
ac_ct_CXX
CXX
@@ -5790,7 +5799,7 @@
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-@@ -1073,13 +1079,17 @@
+@@ -1077,13 +1083,17 @@
GTK_MICRO_VERSION
GTK_MINOR_VERSION
GTK_MAJOR_VERSION
@@ -5809,7 +5818,7 @@
MAKEINFO
AUTOHEADER
AUTOMAKE
-@@ -1088,6 +1098,7 @@
+@@ -1092,6 +1102,7 @@
VERSION
PACKAGE
CYGPATH_W
@@ -5817,7 +5826,7 @@
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-@@ -1179,6 +1190,8 @@
+@@ -1184,6 +1195,8 @@
CCC
CPP
CXXCPP
@@ -5826,7 +5835,7 @@
PKG_CONFIG
BASE_DEPENDENCIES_CFLAGS
BASE_DEPENDENCIES_LIBS
-@@ -1817,16 +1830,16 @@
+@@ -1822,16 +1835,16 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -5847,7 +5856,7 @@
--enable-debug=[no/minimum/yes]
turn on debugging [default=minimum]
--enable-shm support shared memory if available [default=yes]
-@@ -1882,6 +1895,8 @@
+@@ -1890,6 +1903,8 @@
CXXFLAGS C++ compiler flags
CPP C preprocessor
CXXCPP C++ preprocessor
@@ -5856,7 +5865,7 @@
PKG_CONFIG path to pkg-config utility
BASE_DEPENDENCIES_CFLAGS
C compiler flags for BASE_DEPENDENCIES, overriding pkg-config
-@@ -2343,7 +2358,8 @@
+@@ -2351,7 +2366,8 @@
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
@@ -5866,7 +5875,7 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
-@@ -2523,7 +2539,6 @@
+@@ -2531,7 +2547,6 @@
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
@@ -5874,7 +5883,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2537,6 +2552,54 @@
+@@ -2545,6 +2560,54 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -5929,7 +5938,7 @@
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -2619,12 +2682,16 @@
+@@ -2627,12 +2690,16 @@
fi
rmdir .tst 2>/dev/null
@@ -5950,7 +5959,7 @@
fi
# test whether we have cygpath
-@@ -2658,10 +2725,7 @@
+@@ -2666,10 +2733,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -5962,7 +5971,7 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -2761,10 +2825,17 @@
+@@ -2769,10 +2833,17 @@
fi
fi
@@ -5981,7 +5990,7 @@
-@@ -3945,9 +4016,7 @@
+@@ -3953,9 +4024,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
@@ -5992,7 +6001,7 @@
AMDEP_TRUE=
AMDEP_FALSE='#'
else
-@@ -3957,7 +4026,6 @@
+@@ -3965,7 +4034,6 @@
@@ -6000,7 +6009,7 @@
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-@@ -3999,7 +4067,9 @@
+@@ -4007,7 +4075,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -6011,7 +6020,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4023,13 +4093,19 @@
+@@ -4031,13 +4101,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -6034,7 +6043,7 @@
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
-@@ -4047,9 +4123,7 @@
+@@ -4055,9 +4131,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -6045,7 +6054,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -4091,6 +4165,14 @@
+@@ -4099,6 +4173,14 @@
@@ -6060,7 +6069,7 @@
if test -n "$ac_tool_prefix"; then
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -4613,7 +4695,9 @@
+@@ -4621,7 +4703,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -6071,7 +6080,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4637,13 +4721,19 @@
+@@ -4645,13 +4729,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -6094,7 +6103,7 @@
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
-@@ -4661,9 +4751,7 @@
+@@ -4669,9 +4759,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -6105,7 +6114,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -4717,9 +4805,7 @@
+@@ -4725,9 +4813,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6116,7 +6125,7 @@
HAVE_CXX_TRUE=
HAVE_CXX_FALSE='#'
else
-@@ -4772,9 +4858,7 @@
+@@ -4780,9 +4866,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6127,24 +6136,24 @@
HAVE_OBJC_TRUE=
HAVE_OBJC_FALSE='#'
else
-@@ -5725,13 +5809,13 @@
+@@ -5733,13 +5817,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5728: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5812: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5736: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5820: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5731: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5815: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5739: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5734: output\"" >&5)
-+ (eval echo "\"\$as_me:5818: output\"" >&5)
+- (eval echo "\"\$as_me:5742: output\"" >&5)
++ (eval echo "\"\$as_me:5826: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6198,7 +6282,7 @@
+@@ -6206,7 +6290,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -6153,16 +6162,16 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6934,7 +7018,7 @@
+@@ -6942,7 +7026,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6937 "configure"' > conftest.$ac_ext
-+ echo '#line 7021 "configure"' > conftest.$ac_ext
+- echo '#line 6945 "configure"' > conftest.$ac_ext
++ echo '#line 7029 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -8704,7 +8788,9 @@
+@@ -8712,7 +8796,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -6173,7 +6182,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -8728,13 +8814,19 @@
+@@ -8736,13 +8822,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -6196,7 +6205,7 @@
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
-@@ -8752,9 +8844,7 @@
+@@ -8760,9 +8852,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -6207,63 +6216,63 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -9467,11 +9557,11 @@
+@@ -9475,11 +9565,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:9470: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9560: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9478: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9474: \$? = $ac_status" >&5
-+ echo "$as_me:9564: \$? = $ac_status" >&5
+- echo "$as_me:9482: \$? = $ac_status" >&5
++ echo "$as_me:9572: \$? = $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.
-@@ -9806,11 +9896,11 @@
+@@ -9814,11 +9904,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:9809: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9899: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9817: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9907: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9813: \$? = $ac_status" >&5
-+ echo "$as_me:9903: \$? = $ac_status" >&5
+- echo "$as_me:9821: \$? = $ac_status" >&5
++ echo "$as_me:9911: \$? = $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.
-@@ -9911,11 +10001,11 @@
+@@ -9919,11 +10009,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:9914: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10004: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9922: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10012: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9918: \$? = $ac_status" >&5
-+ echo "$as_me:10008: \$? = $ac_status" >&5
+- echo "$as_me:9926: \$? = $ac_status" >&5
++ echo "$as_me:10016: \$? = $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
-@@ -9966,11 +10056,11 @@
+@@ -9974,11 +10064,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:9969: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10059: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9977: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9973: \$? = $ac_status" >&5
-+ echo "$as_me:10063: \$? = $ac_status" >&5
+- echo "$as_me:9981: \$? = $ac_status" >&5
++ echo "$as_me:10071: \$? = $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
-@@ -10085,6 +10175,9 @@
+@@ -10093,6 +10183,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -6273,7 +6282,7 @@
esac
ld_shlibs=yes
-@@ -10267,7 +10360,7 @@
+@@ -10275,7 +10368,7 @@
fi
;;
@@ -6282,7 +6291,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10442,6 +10535,7 @@
+@@ -10450,6 +10543,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -6290,7 +6299,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10856,7 +10950,7 @@
+@@ -10864,7 +10958,7 @@
link_all_deplibs=yes
;;
@@ -6299,7 +6308,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11818,13 +11912,10 @@
+@@ -11826,13 +11920,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6314,7 +6323,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11836,6 +11927,18 @@
+@@ -11844,6 +11935,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6333,25 +6342,25 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12769,7 +12872,7 @@
+@@ -12777,7 +12880,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12772 "configure"
-+#line 12875 "configure"
+-#line 12780 "configure"
++#line 12883 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12865,7 +12968,7 @@
+@@ -12873,7 +12976,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12868 "configure"
-+#line 12971 "configure"
+-#line 12876 "configure"
++#line 12979 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14761,7 +14864,7 @@
+@@ -14769,7 +14872,7 @@
;;
esac
;;
@@ -6360,49 +6369,49 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14885,11 +14988,11 @@
+@@ -14893,11 +14996,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:14888: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14991: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14896: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14999: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14892: \$? = $ac_status" >&5
-+ echo "$as_me:14995: \$? = $ac_status" >&5
+- echo "$as_me:14900: \$? = $ac_status" >&5
++ echo "$as_me:15003: \$? = $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.
-@@ -14984,11 +15087,11 @@
+@@ -14992,11 +15095,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:14987: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15090: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14995: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15098: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14991: \$? = $ac_status" >&5
-+ echo "$as_me:15094: \$? = $ac_status" >&5
+- echo "$as_me:14999: \$? = $ac_status" >&5
++ echo "$as_me:15102: \$? = $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
-@@ -15036,11 +15139,11 @@
+@@ -15044,11 +15147,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:15039: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15142: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15047: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15043: \$? = $ac_status" >&5
-+ echo "$as_me:15146: \$? = $ac_status" >&5
+- echo "$as_me:15051: \$? = $ac_status" >&5
++ echo "$as_me:15154: \$? = $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
-@@ -15112,6 +15215,9 @@
+@@ -15120,6 +15223,9 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6412,7 +6421,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -15683,13 +15789,10 @@
+@@ -15691,13 +15797,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -6427,7 +6436,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15701,6 +15804,18 @@
+@@ -15709,6 +15812,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6446,7 +6455,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17942,9 +18057,117 @@
+@@ -17950,9 +18065,117 @@
# By default we simply use the C compiler to build assembly code.
@@ -6567,7 +6576,7 @@
# Extract the first word of "nm", so it can be a program name with args.
-@@ -18000,9 +18223,7 @@
+@@ -18008,9 +18231,7 @@
{ $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
@@ -6578,7 +6587,7 @@
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
-@@ -18026,9 +18247,7 @@
+@@ -18034,9 +18255,7 @@
esac
{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5
$as_echo "$platform_win32" >&6; }
@@ -6589,7 +6598,7 @@
PLATFORM_WIN32_TRUE=
PLATFORM_WIN32_FALSE='#'
else
-@@ -18037,9 +18256,7 @@
+@@ -18045,9 +18264,7 @@
fi
@@ -6600,7 +6609,7 @@
OS_WIN32_TRUE=
OS_WIN32_FALSE='#'
else
-@@ -18047,9 +18264,7 @@
+@@ -18055,9 +18272,7 @@
OS_WIN32_FALSE=
fi
@@ -6611,7 +6620,7 @@
OS_UNIX_TRUE=
OS_UNIX_FALSE='#'
else
-@@ -18057,9 +18272,7 @@
+@@ -18065,9 +18280,7 @@
OS_UNIX_FALSE=
fi
@@ -6622,7 +6631,7 @@
OS_LINUX_TRUE=
OS_LINUX_FALSE='#'
else
-@@ -18205,9 +18418,7 @@
+@@ -18213,9 +18426,7 @@
fi
@@ -6633,7 +6642,7 @@
MS_LIB_AVAILABLE_TRUE=
MS_LIB_AVAILABLE_FALSE='#'
else
-@@ -18454,333 +18665,70 @@
+@@ -18462,333 +18673,70 @@
fi
@@ -7002,7 +7011,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -18788,31 +18736,979 @@
+@@ -18796,31 +18744,979 @@
done
IFS=$as_save_IFS
@@ -8001,7 +8010,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
*)
-@@ -18878,10 +19774,11 @@
+@@ -18886,10 +19782,11 @@
{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
@@ -8017,7 +8026,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5
ac_status=$?
-@@ -18891,13 +19788,15 @@
+@@ -18899,13 +19796,15 @@
else
pkg_failed=yes
fi
@@ -8039,7 +8048,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5
ac_status=$?
-@@ -18907,8 +19806,9 @@
+@@ -18915,8 +19814,9 @@
else
pkg_failed=yes
fi
@@ -8051,7 +8060,7 @@
fi
-@@ -18921,9 +19821,9 @@
+@@ -18929,9 +19829,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -8063,7 +8072,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -19024,9 +19924,7 @@
+@@ -19032,9 +19932,7 @@
{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5
$as_echo "$enable_explicit_deps" >&6; }
@@ -8074,7 +8083,7 @@
DISABLE_EXPLICIT_DEPS_TRUE=
DISABLE_EXPLICIT_DEPS_FALSE='#'
else
-@@ -24602,9 +25500,7 @@
+@@ -24610,9 +25508,7 @@
fi
@@ -8085,7 +8094,7 @@
BUILD_GDIPLUS_LOADERS_TRUE=
BUILD_GDIPLUS_LOADERS_FALSE='#'
else
-@@ -25858,9 +26754,7 @@
+@@ -25866,9 +26762,7 @@
@@ -8096,7 +8105,7 @@
BUILD_DYNAMIC_MODULES_TRUE=
BUILD_DYNAMIC_MODULES_FALSE='#'
else
-@@ -25953,9 +26847,7 @@
+@@ -25961,9 +26855,7 @@
@@ -8107,7 +8116,7 @@
INCLUDE_PNG_TRUE=
INCLUDE_PNG_FALSE='#'
else
-@@ -25963,9 +26855,7 @@
+@@ -25971,9 +26863,7 @@
INCLUDE_PNG_FALSE=
fi
@@ -8118,7 +8127,7 @@
INCLUDE_BMP_TRUE=
INCLUDE_BMP_FALSE='#'
else
-@@ -25973,9 +26863,7 @@
+@@ -25981,9 +26871,7 @@
INCLUDE_BMP_FALSE=
fi
@@ -8129,7 +8138,7 @@
INCLUDE_WBMP_TRUE=
INCLUDE_WBMP_FALSE='#'
else
-@@ -25983,9 +26871,7 @@
+@@ -25991,9 +26879,7 @@
INCLUDE_WBMP_FALSE=
fi
@@ -8140,7 +8149,7 @@
INCLUDE_GIF_TRUE=
INCLUDE_GIF_FALSE='#'
else
-@@ -25993,9 +26879,7 @@
+@@ -26001,9 +26887,7 @@
INCLUDE_GIF_FALSE=
fi
@@ -8151,7 +8160,7 @@
INCLUDE_ICO_TRUE=
INCLUDE_ICO_FALSE='#'
else
-@@ -26003,9 +26887,7 @@
+@@ -26011,9 +26895,7 @@
INCLUDE_ICO_FALSE=
fi
@@ -8162,7 +8171,7 @@
INCLUDE_ANI_TRUE=
INCLUDE_ANI_FALSE='#'
else
-@@ -26013,9 +26895,7 @@
+@@ -26021,9 +26903,7 @@
INCLUDE_ANI_FALSE=
fi
@@ -8173,7 +8182,7 @@
INCLUDE_JPEG_TRUE=
INCLUDE_JPEG_FALSE='#'
else
-@@ -26023,9 +26903,7 @@
+@@ -26031,9 +26911,7 @@
INCLUDE_JPEG_FALSE=
fi
@@ -8184,7 +8193,7 @@
INCLUDE_PNM_TRUE=
INCLUDE_PNM_FALSE='#'
else
-@@ -26033,9 +26911,7 @@
+@@ -26041,9 +26919,7 @@
INCLUDE_PNM_FALSE=
fi
@@ -8195,7 +8204,7 @@
INCLUDE_RAS_TRUE=
INCLUDE_RAS_FALSE='#'
else
-@@ -26043,9 +26919,7 @@
+@@ -26051,9 +26927,7 @@
INCLUDE_RAS_FALSE=
fi
@@ -8206,7 +8215,7 @@
INCLUDE_TIFF_TRUE=
INCLUDE_TIFF_FALSE='#'
else
-@@ -26053,9 +26927,7 @@
+@@ -26061,9 +26935,7 @@
INCLUDE_TIFF_FALSE=
fi
@@ -8217,7 +8226,7 @@
INCLUDE_XPM_TRUE=
INCLUDE_XPM_FALSE='#'
else
-@@ -26063,9 +26935,7 @@
+@@ -26071,9 +26943,7 @@
INCLUDE_XPM_FALSE=
fi
@@ -8228,7 +8237,7 @@
INCLUDE_XBM_TRUE=
INCLUDE_XBM_FALSE='#'
else
-@@ -26073,9 +26943,7 @@
+@@ -26081,9 +26951,7 @@
INCLUDE_XBM_FALSE=
fi
@@ -8239,7 +8248,7 @@
INCLUDE_TGA_TRUE=
INCLUDE_TGA_FALSE='#'
else
-@@ -26083,9 +26951,7 @@
+@@ -26091,9 +26959,7 @@
INCLUDE_TGA_FALSE=
fi
@@ -8250,7 +8259,7 @@
INCLUDE_PCX_TRUE=
INCLUDE_PCX_FALSE='#'
else
-@@ -26093,9 +26959,7 @@
+@@ -26101,9 +26967,7 @@
INCLUDE_PCX_FALSE=
fi
@@ -8261,7 +8270,7 @@
INCLUDE_ICNS_TRUE=
INCLUDE_ICNS_FALSE='#'
else
-@@ -26103,9 +26967,7 @@
+@@ -26111,9 +26975,7 @@
INCLUDE_ICNS_FALSE=
fi
@@ -8272,7 +8281,7 @@
INCLUDE_JASPER_TRUE=
INCLUDE_JASPER_FALSE='#'
else
-@@ -26115,9 +26977,7 @@
+@@ -26123,9 +26985,7 @@
# As all GDI+ loaders are either built-in or not, arbitrarily just
# check one of the variables here
@@ -8283,7 +8292,7 @@
INCLUDE_GDIPLUS_TRUE=
INCLUDE_GDIPLUS_FALSE='#'
else
-@@ -26266,9 +27126,7 @@
+@@ -26274,9 +27134,7 @@
{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5
$as_echo "$included_immodules" >&6; }
@@ -8294,7 +8303,7 @@
HAVE_INCLUDED_IMMMODULES_TRUE=
HAVE_INCLUDED_IMMMODULES_FALSE='#'
else
-@@ -26299,9 +27157,7 @@
+@@ -26307,9 +27165,7 @@
@@ -8305,7 +8314,7 @@
INCLUDE_IM_AM_ET_TRUE=
INCLUDE_IM_AM_ET_FALSE='#'
else
-@@ -26309,9 +27165,7 @@
+@@ -26317,9 +27173,7 @@
INCLUDE_IM_AM_ET_FALSE=
fi
@@ -8316,7 +8325,7 @@
INCLUDE_IM_CEDILLA_TRUE=
INCLUDE_IM_CEDILLA_FALSE='#'
else
-@@ -26319,9 +27173,7 @@
+@@ -26327,9 +27181,7 @@
INCLUDE_IM_CEDILLA_FALSE=
fi
@@ -8327,7 +8336,7 @@
INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE=
INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#'
else
-@@ -26329,9 +27181,7 @@
+@@ -26337,9 +27189,7 @@
INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE=
fi
@@ -8338,7 +8347,7 @@
INCLUDE_IM_IME_TRUE=
INCLUDE_IM_IME_FALSE='#'
else
-@@ -26339,9 +27189,7 @@
+@@ -26347,9 +27197,7 @@
INCLUDE_IM_IME_FALSE=
fi
@@ -8349,7 +8358,7 @@
INCLUDE_IM_INUKTITUT_TRUE=
INCLUDE_IM_INUKTITUT_FALSE='#'
else
-@@ -26349,9 +27197,7 @@
+@@ -26357,9 +27205,7 @@
INCLUDE_IM_INUKTITUT_FALSE=
fi
@@ -8360,7 +8369,7 @@
INCLUDE_IM_IPA_TRUE=
INCLUDE_IM_IPA_FALSE='#'
else
-@@ -26359,9 +27205,7 @@
+@@ -26367,9 +27213,7 @@
INCLUDE_IM_IPA_FALSE=
fi
@@ -8371,7 +8380,7 @@
INCLUDE_IM_MULTIPRESS_TRUE=
INCLUDE_IM_MULTIPRESS_FALSE='#'
else
-@@ -26369,9 +27213,7 @@
+@@ -26377,9 +27221,7 @@
INCLUDE_IM_MULTIPRESS_FALSE=
fi
@@ -8382,7 +8391,7 @@
INCLUDE_IM_THAI_TRUE=
INCLUDE_IM_THAI_FALSE='#'
else
-@@ -26379,9 +27221,7 @@
+@@ -26387,9 +27229,7 @@
INCLUDE_IM_THAI_FALSE=
fi
@@ -8393,7 +8402,7 @@
INCLUDE_IM_TI_ER_TRUE=
INCLUDE_IM_TI_ER_FALSE='#'
else
-@@ -26389,9 +27229,7 @@
+@@ -26397,9 +27237,7 @@
INCLUDE_IM_TI_ER_FALSE=
fi
@@ -8404,7 +8413,7 @@
INCLUDE_IM_TI_ET_TRUE=
INCLUDE_IM_TI_ET_FALSE='#'
else
-@@ -26399,9 +27237,7 @@
+@@ -26407,9 +27245,7 @@
INCLUDE_IM_TI_ET_FALSE=
fi
@@ -8415,7 +8424,7 @@
INCLUDE_IM_VIQR_TRUE=
INCLUDE_IM_VIQR_FALSE='#'
else
-@@ -26409,9 +27245,7 @@
+@@ -26417,9 +27253,7 @@
INCLUDE_IM_VIQR_FALSE=
fi
@@ -8426,7 +8435,7 @@
INCLUDE_IM_XIM_TRUE=
INCLUDE_IM_XIM_FALSE='#'
else
-@@ -26548,9 +27382,7 @@
+@@ -26556,9 +27390,7 @@
@@ -8437,7 +8446,7 @@
HAVE_TIFF_TRUE=
HAVE_TIFF_FALSE='#'
else
-@@ -26558,9 +27390,7 @@
+@@ -26566,9 +27398,7 @@
HAVE_TIFF_FALSE=
fi
@@ -8448,7 +8457,7 @@
HAVE_PNG_TRUE=
HAVE_PNG_FALSE='#'
else
-@@ -26568,9 +27398,7 @@
+@@ -26576,9 +27406,7 @@
HAVE_PNG_FALSE=
fi
@@ -8459,7 +8468,7 @@
HAVE_JPEG_TRUE=
HAVE_JPEG_FALSE='#'
else
-@@ -26578,9 +27406,7 @@
+@@ -26586,9 +27414,7 @@
HAVE_JPEG_FALSE=
fi
@@ -8470,7 +8479,7 @@
HAVE_JASPER_TRUE=
HAVE_JASPER_FALSE='#'
else
-@@ -27060,9 +27886,7 @@
+@@ -27068,9 +27894,7 @@
fi
fi
@@ -8481,7 +8490,7 @@
USE_MEDIALIB_TRUE=
USE_MEDIALIB_FALSE='#'
else
-@@ -27070,9 +27894,7 @@
+@@ -27078,9 +27902,7 @@
USE_MEDIALIB_FALSE=
fi
@@ -8492,7 +8501,7 @@
USE_MEDIALIB25_TRUE=
USE_MEDIALIB25_FALSE='#'
else
-@@ -27132,9 +27954,7 @@
+@@ -27140,9 +27962,7 @@
fi
fi
@@ -8503,7 +8512,7 @@
USE_MMX_TRUE=
USE_MMX_FALSE='#'
else
-@@ -27149,9 +27969,7 @@
+@@ -27157,9 +27977,7 @@
fi
@@ -8514,7 +8523,7 @@
CROSS_COMPILING_TRUE=
CROSS_COMPILING_FALSE='#'
else
-@@ -29314,9 +30132,7 @@
+@@ -29322,9 +30140,7 @@
_ACEOF
fi
@@ -8525,7 +8534,7 @@
HAVE_X11R6_TRUE=
HAVE_X11R6_FALSE='#'
else
-@@ -30567,9 +31383,7 @@
+@@ -30575,9 +31391,7 @@
fi
@@ -8536,7 +8545,7 @@
XINPUT_XFREE_TRUE=
XINPUT_XFREE_FALSE='#'
else
-@@ -30649,9 +31463,7 @@
+@@ -30657,9 +31471,7 @@
CPPFLAGS="$gtk_save_cppflags"
LIBS="$gtk_save_libs"
@@ -8547,7 +8556,7 @@
USE_X11_TRUE=
USE_X11_FALSE='#'
else
-@@ -30660,9 +31472,7 @@
+@@ -30668,9 +31480,7 @@
fi
else
@@ -8558,7 +8567,7 @@
XINPUT_XFREE_TRUE=
XINPUT_XFREE_FALSE='#'
else
-@@ -30670,9 +31480,7 @@
+@@ -30678,9 +31488,7 @@
XINPUT_XFREE_FALSE=
fi
@@ -8569,7 +8578,7 @@
USE_X11_TRUE=
USE_X11_FALSE='#'
else
-@@ -30680,9 +31488,7 @@
+@@ -30688,9 +31496,7 @@
USE_X11_FALSE=
fi
@@ -8580,7 +8589,7 @@
HAVE_X11R6_TRUE=
HAVE_X11R6_FALSE='#'
else
-@@ -30694,9 +31500,7 @@
+@@ -30702,9 +31508,7 @@
if test "x$gdktarget" = "xwin32"; then
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
@@ -8591,7 +8600,7 @@
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
else
-@@ -30705,9 +31509,7 @@
+@@ -30713,9 +31517,7 @@
fi
else
@@ -8602,7 +8611,7 @@
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
else
-@@ -30719,9 +31521,7 @@
+@@ -30727,9 +31529,7 @@
if test "x$gdktarget" = "xquartz"; then
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
@@ -8613,7 +8622,7 @@
USE_QUARTZ_TRUE=
USE_QUARTZ_FALSE='#'
else
-@@ -30730,9 +31530,7 @@
+@@ -30738,9 +31538,7 @@
fi
else
@@ -8624,7 +8633,7 @@
USE_QUARTZ_TRUE=
USE_QUARTZ_FALSE='#'
else
-@@ -30775,9 +31573,7 @@
+@@ -30783,9 +31581,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -8635,7 +8644,7 @@
USE_DIRECTFB_TRUE=
USE_DIRECTFB_FALSE='#'
else
-@@ -30786,9 +31582,7 @@
+@@ -30794,9 +31590,7 @@
fi
else
@@ -8646,7 +8655,7 @@
USE_DIRECTFB_TRUE=
USE_DIRECTFB_FALSE='#'
else
-@@ -30902,18 +31696,19 @@
+@@ -30910,18 +31704,19 @@
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
if test "x$gdktarget" = "xx11"; then
@@ -8670,7 +8679,7 @@
fi
-@@ -30923,6 +31718,7 @@
+@@ -30931,6 +31726,7 @@
@@ -8678,7 +8687,7 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -31035,7 +31831,7 @@
+@@ -31043,7 +31839,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then
@@ -8687,7 +8696,7 @@
fi
-@@ -31668,9 +32464,7 @@
+@@ -31676,9 +32472,7 @@
fi
@@ -8698,7 +8707,7 @@
HAVE_CUPS_TRUE=
HAVE_CUPS_FALSE='#'
else
-@@ -31837,9 +32631,7 @@
+@@ -31845,9 +32639,7 @@
LIBS="$gtk_save_libs"
else
@@ -8709,7 +8718,40 @@
HAVE_CUPS_TRUE=
HAVE_CUPS_FALSE='#'
else
-@@ -32156,9 +32948,7 @@
+@@ -31950,9 +32742,7 @@
+ _ACEOF
+
+ fi
+-
+-
+-if test $have_papi = yes; then
++ if test $have_papi = yes; then
+ HAVE_PAPI_TRUE=
+ HAVE_PAPI_FALSE='#'
+ else
+@@ -31961,9 +32751,7 @@
+ fi
+
+ else
+-
+-
+-if false; then
++ if false; then
+ HAVE_PAPI_TRUE=
+ HAVE_PAPI_FALSE='#'
+ else
+@@ -31973,9 +32761,7 @@
+
+ fi
+
+-
+-
+-if test $have_papi = yes && test "x$CUPS_CONFIG" != "xno"; then
++ if test $have_papi = yes && test "x$CUPS_CONFIG" != "xno"; then
+ HAVE_PAPI_CUPS_TRUE=
+ HAVE_PAPI_CUPS_FALSE='#'
+ else
+@@ -32291,9 +33077,7 @@
enable_test_print_backend=no
fi
@@ -8720,7 +8762,7 @@
TEST_PRINT_BACKEND_TRUE=
TEST_PRINT_BACKEND_FALSE='#'
else
-@@ -32281,9 +33071,7 @@
+@@ -32416,9 +33200,7 @@
done
@@ -8731,7 +8773,7 @@
ENABLE_GTK_DOC_TRUE=
ENABLE_GTK_DOC_FALSE='#'
else
-@@ -32291,9 +33079,7 @@
+@@ -32426,9 +33208,7 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -8742,7 +8784,7 @@
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
else
-@@ -32341,9 +33127,7 @@
+@@ -32476,9 +33256,7 @@
fi
@@ -8753,7 +8795,7 @@
HAVE_DOCBOOK_TRUE=
HAVE_DOCBOOK_FALSE='#'
else
-@@ -32517,9 +33301,7 @@
+@@ -32652,9 +33430,7 @@
fi
@@ -8764,7 +8806,7 @@
ENABLE_MAN_TRUE=
ENABLE_MAN_FALSE='#'
else
-@@ -32650,6 +33432,13 @@
+@@ -32785,6 +33561,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8778,7 +8820,7 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -32678,6 +33467,13 @@
+@@ -32813,6 +33596,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8792,7 +8834,7 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -32720,6 +33516,13 @@
+@@ -32855,6 +33645,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8806,7 +8848,7 @@
if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -33536,6 +34339,7 @@
+@@ -33692,6 +34489,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -8814,7 +8856,7 @@
AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
-@@ -34605,6 +35409,11 @@
+@@ -34762,6 +35560,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -8826,7 +8868,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-@@ -34661,6 +35470,7 @@
+@@ -34818,6 +35621,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
@@ -8834,7 +8876,7 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-@@ -34715,21 +35525,22 @@
+@@ -34872,21 +35676,22 @@
{ (exit 1); exit 1; }; }
fi
# Compute "$ac_file"'s index in $config_headers.
@@ -8864,7 +8906,25 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34764,8 +35575,9 @@
+@@ -34913,7 +35718,16 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file. Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*) set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+@@ -34921,8 +35735,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -8876,7 +8936,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -34792,27 +35604,21 @@
+@@ -34949,27 +35764,21 @@
else
continue
fi
@@ -8917,12 +8977,12 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
-diff -Naur gtk+2.0-2.16.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.16.1/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.16.1.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-04-11 21:55:27.000000000 +0200
-+++ gtk+2.0-2.16.1/contrib/gdk-pixbuf-xlib/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.16.2/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.16.2.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-05-31 06:11:01.000000000 +0200
++++ gtk+2.0-2.16.2/contrib/gdk-pixbuf-xlib/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -9080,7 +9140,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +189,14 @@
+@@ -149,95 +189,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -9099,6 +9159,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -9173,7 +9237,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +220,15 @@
+@@ -261,24 +220,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -9199,7 +9263,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +241,6 @@
+@@ -291,8 +241,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -9208,7 +9272,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +252,10 @@
+@@ -304,28 +252,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -9237,7 +9301,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +264,25 @@
+@@ -334,22 +264,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -9267,7 +9331,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +306,7 @@
+@@ -373,6 +306,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -9275,7 +9339,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +315,12 @@
+@@ -381,9 +315,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -9289,7 +9353,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,29 +351,23 @@
+@@ -414,29 +351,23 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -9319,7 +9383,7 @@
libgdk_pixbuf_xlib_2_0_la_SOURCES = \
gdk-pixbuf-xlib-private.h \
gdk-pixbuf-xlib.c \
-@@ -440,99 +375,80 @@
+@@ -444,99 +375,80 @@
gdk-pixbuf-xlib-drawable.c \
gdk-pixbuf-xlibrgb.c
@@ -9381,8 +9445,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -9457,7 +9521,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -543,100 +459,75 @@
+@@ -547,100 +459,75 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo at am__quote@
.c.o:
@@ -9580,14 +9644,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -646,23 +537,23 @@
+@@ -650,23 +537,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -9620,7 +9684,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -674,29 +565,23 @@
+@@ -678,29 +565,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -9663,7 +9727,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -711,9 +596,10 @@
+@@ -715,9 +596,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
@@ -9676,7 +9740,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -733,7 +619,7 @@
+@@ -737,7 +619,7 @@
clean-generic:
distclean-generic:
@@ -9685,7 +9749,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -747,12 +633,14 @@
+@@ -751,12 +633,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -9701,7 +9765,7 @@
info: info-am
info-am:
-@@ -760,12 +648,20 @@
+@@ -764,12 +648,20 @@
install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \
install-pkgconfigDATA
@@ -9722,7 +9786,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -786,23 +682,27 @@
+@@ -790,23 +682,27 @@
ps-am:
@@ -9762,12 +9826,12 @@
uninstall-libgdk_pixbuf_xlibincludeHEADERS \
uninstall-pkgconfigDATA
-diff -Naur gtk+2.0-2.16.1.old/contrib/Makefile.in gtk+2.0-2.16.1/contrib/Makefile.in
---- gtk+2.0-2.16.1.old/contrib/Makefile.in 2009-04-11 21:55:27.000000000 +0200
-+++ gtk+2.0-2.16.1/contrib/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/contrib/Makefile.in gtk+2.0-2.16.2/contrib/Makefile.in
+--- gtk+2.0-2.16.2.old/contrib/Makefile.in 2009-05-31 06:11:01.000000000 +0200
++++ gtk+2.0-2.16.2/contrib/Makefile.in 2009-06-02 07:42:44.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -9895,7 +9959,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,91 +157,14 @@
+@@ -150,95 +157,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -9914,6 +9978,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -9988,7 +10056,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -258,24 +188,15 @@
+@@ -262,24 +188,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -10014,7 +10082,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -288,8 +209,6 @@
+@@ -292,8 +209,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -10023,7 +10091,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +220,10 @@
+@@ -305,28 +220,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -10052,7 +10120,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +232,25 @@
+@@ -335,22 +232,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -10082,7 +10150,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -370,6 +274,7 @@
+@@ -374,6 +274,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -10090,7 +10158,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,9 +283,12 @@
+@@ -382,9 +283,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10104,7 +10172,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -411,31 +319,39 @@
+@@ -415,31 +319,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -10133,8 +10201,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -10163,7 +10231,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -443,10 +359,6 @@
+@@ -447,10 +359,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10174,7 +10242,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -454,7 +366,13 @@
+@@ -458,7 +366,13 @@
# (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):
@@ -10189,7 +10257,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -466,15 +384,20 @@
+@@ -470,15 +384,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10214,7 +10282,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -495,7 +418,7 @@
+@@ -499,7 +418,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10223,7 +10291,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -506,35 +429,30 @@
+@@ -510,35 +429,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -10242,7 +10310,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -10266,7 +10334,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -542,23 +460,23 @@
+@@ -546,23 +460,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -10299,7 +10367,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -570,29 +488,23 @@
+@@ -574,29 +488,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -10342,7 +10410,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -605,13 +517,17 @@
+@@ -609,13 +517,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -10364,7 +10432,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -622,7 +538,6 @@
+@@ -626,7 +538,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -10372,7 +10440,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -642,7 +557,7 @@
+@@ -646,7 +557,7 @@
clean-generic:
distclean-generic:
@@ -10381,7 +10449,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -653,25 +568,34 @@
+@@ -657,25 +568,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -10418,7 +10486,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -690,26 +614,24 @@
+@@ -694,26 +614,24 @@
ps-am:
@@ -10461,12 +10529,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.16.1/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.16.1.old/demos/gtk-demo/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/demos/gtk-demo/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.16.2/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.16.2.old/demos/gtk-demo/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/demos/gtk-demo/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -10624,7 +10692,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +189,14 @@
+@@ -149,95 +189,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -10643,6 +10711,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -10717,7 +10789,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +220,15 @@
+@@ -261,24 +220,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -10743,7 +10815,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +241,6 @@
+@@ -291,8 +241,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -10752,7 +10824,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +252,10 @@
+@@ -304,28 +252,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -10781,7 +10853,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +264,25 @@
+@@ -334,22 +264,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -10811,7 +10883,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +306,7 @@
+@@ -373,6 +306,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -10819,7 +10891,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,17 +315,17 @@
+@@ -381,17 +315,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10842,7 +10914,7 @@
TEST_PROGS =
### testing rules
-@@ -413,9 +351,7 @@
+@@ -417,9 +351,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -10852,7 +10924,7 @@
demos = \
appwindow.c \
assistant.c \
-@@ -449,7 +385,6 @@
+@@ -453,7 +385,6 @@
tree_store.c \
ui_manager.c
@@ -10860,7 +10932,7 @@
INCLUDES = \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-@@ -459,34 +394,26 @@
+@@ -463,34 +394,26 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -10895,7 +10967,7 @@
IMAGEFILES = alphatest.png \
apple-red.png \
background.jpg \
-@@ -502,95 +429,55 @@
+@@ -506,95 +429,55 @@
gnu-keys.png \
gtk-logo-rgb.gif
@@ -10974,8 +11046,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -11022,7 +11094,7 @@
else :; fi; \
done
-@@ -598,8 +485,8 @@
+@@ -602,8 +485,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -11033,7 +11105,7 @@
done
clean-binPROGRAMS:
-@@ -610,10 +497,10 @@
+@@ -614,10 +497,10 @@
done
gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES)
@rm -f gtk-demo$(EXEEXT)
@@ -11046,7 +11118,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -652,82 +539,58 @@
+@@ -656,82 +539,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ui_manager.Po at am__quote@
.c.o:
@@ -11144,14 +11216,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -737,23 +600,23 @@
+@@ -741,23 +600,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -11184,7 +11256,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -765,29 +628,23 @@
+@@ -769,29 +628,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -11227,7 +11299,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -803,9 +660,10 @@
+@@ -807,9 +660,10 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
@@ -11240,7 +11312,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
-@@ -826,7 +684,7 @@
+@@ -830,7 +684,7 @@
clean-generic:
distclean-generic:
@@ -11249,7 +11321,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -841,24 +699,34 @@
+@@ -845,24 +699,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -11285,7 +11357,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -879,21 +747,24 @@
+@@ -883,21 +747,24 @@
ps-am:
@@ -11321,12 +11393,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/demos/Makefile.in gtk+2.0-2.16.1/demos/Makefile.in
---- gtk+2.0-2.16.1.old/demos/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/demos/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/demos/Makefile.in gtk+2.0-2.16.2/demos/Makefile.in
+--- gtk+2.0-2.16.2.old/demos/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/demos/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -11491,7 +11563,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,91 +196,14 @@
+@@ -150,95 +196,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -11510,6 +11582,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -11584,7 +11660,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -258,24 +227,15 @@
+@@ -262,24 +227,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -11610,7 +11686,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -288,8 +248,6 @@
+@@ -292,8 +248,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -11619,7 +11695,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +259,10 @@
+@@ -305,28 +259,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -11648,7 +11724,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +271,25 @@
+@@ -335,22 +271,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -11678,7 +11754,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -370,6 +313,7 @@
+@@ -374,6 +313,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -11686,7 +11762,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,24 +322,19 @@
+@@ -382,24 +322,19 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -11718,7 +11794,7 @@
TEST_PROGS =
### testing rules
-@@ -421,9 +360,7 @@
+@@ -425,9 +360,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -11728,7 +11804,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -432,131 +369,74 @@
+@@ -436,131 +369,74 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -11859,8 +11935,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -11889,7 +11965,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -566,25 +446,25 @@
+@@ -570,25 +446,25 @@
done
pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES)
@rm -f pixbuf-demo$(EXEEXT)
@@ -11922,7 +11998,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -598,37 +478,25 @@
+@@ -602,37 +478,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testpixbuf.Po at am__quote@
.c.o:
@@ -11972,7 +12048,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -636,10 +504,6 @@
+@@ -640,10 +504,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -11983,7 +12059,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -647,7 +511,13 @@
+@@ -651,7 +511,13 @@
# (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):
@@ -11998,7 +12074,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -659,15 +529,20 @@
+@@ -663,15 +529,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -12023,7 +12099,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -688,7 +563,7 @@
+@@ -692,7 +563,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -12032,7 +12108,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -699,35 +574,30 @@
+@@ -703,35 +574,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -12051,7 +12127,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -12075,7 +12151,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -735,23 +605,23 @@
+@@ -739,23 +605,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -12108,7 +12184,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -763,29 +633,23 @@
+@@ -767,29 +633,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -12151,7 +12227,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -796,15 +660,19 @@
+@@ -800,15 +660,19 @@
|| exit 1; \
fi; \
done
@@ -12176,7 +12252,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -816,7 +684,6 @@
+@@ -820,7 +684,6 @@
all-am: Makefile $(PROGRAMS)
installdirs: installdirs-recursive
installdirs-am:
@@ -12184,7 +12260,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -837,7 +704,7 @@
+@@ -841,7 +704,7 @@
clean-generic:
distclean-generic:
@@ -12193,7 +12269,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -853,24 +720,34 @@
+@@ -857,24 +720,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -12229,7 +12305,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -891,27 +768,25 @@
+@@ -895,27 +768,25 @@
ps-am:
@@ -12274,9 +12350,9 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/depcomp gtk+2.0-2.16.1/depcomp
---- gtk+2.0-2.16.1.old/depcomp 2009-02-24 04:53:12.000000000 +0100
-+++ gtk+2.0-2.16.1/depcomp 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/depcomp gtk+2.0-2.16.2/depcomp
+--- gtk+2.0-2.16.2.old/depcomp 2009-02-24 04:53:12.000000000 +0100
++++ gtk+2.0-2.16.2/depcomp 2009-06-02 07:42:52.000000000 +0200
@@ -1,7 +1,10 @@
#! /bin/sh
-
@@ -12556,12 +12632,12 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Naur gtk+2.0-2.16.1.old/docs/faq/Makefile.in gtk+2.0-2.16.1/docs/faq/Makefile.in
---- gtk+2.0-2.16.1.old/docs/faq/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/faq/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/faq/Makefile.in gtk+2.0-2.16.2/docs/faq/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/faq/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/faq/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -12676,7 +12752,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +144,14 @@
+@@ -149,95 +144,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -12695,6 +12771,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -12769,7 +12849,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +175,15 @@
+@@ -261,24 +175,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -12795,7 +12875,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +196,6 @@
+@@ -291,8 +196,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -12804,7 +12884,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +207,10 @@
+@@ -304,28 +207,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -12833,7 +12913,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +219,25 @@
+@@ -334,22 +219,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -12863,7 +12943,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +261,7 @@
+@@ -373,6 +261,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -12871,7 +12951,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,16 +270,17 @@
+@@ -381,16 +270,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -12893,7 +12973,7 @@
TEST_PROGS =
### testing rules
-@@ -412,61 +306,67 @@
+@@ -416,61 +306,67 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -12913,8 +12993,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -12995,7 +13075,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -484,7 +384,6 @@
+@@ -488,7 +384,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile
@@ -13003,7 +13083,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -505,7 +404,7 @@
+@@ -509,7 +404,7 @@
clean-generic:
distclean-generic:
@@ -13012,7 +13092,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -516,7 +415,7 @@
+@@ -520,7 +415,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -13021,7 +13101,7 @@
dvi: dvi-am
-@@ -528,12 +427,20 @@
+@@ -532,12 +427,20 @@
install-data-am:
@@ -13042,7 +13122,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -544,25 +451,27 @@
+@@ -548,25 +451,27 @@
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
@@ -13081,12 +13161,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/Makefile.in gtk+2.0-2.16.1/docs/Makefile.in
---- gtk+2.0-2.16.1.old/docs/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/Makefile.in gtk+2.0-2.16.2/docs/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -13213,7 +13293,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +156,14 @@
+@@ -149,95 +156,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -13232,6 +13312,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -13306,7 +13390,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +187,15 @@
+@@ -261,24 +187,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -13332,7 +13416,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +208,6 @@
+@@ -291,8 +208,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -13341,7 +13425,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +219,10 @@
+@@ -304,28 +219,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -13370,7 +13454,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +231,25 @@
+@@ -334,22 +231,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -13400,7 +13484,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +273,7 @@
+@@ -373,6 +273,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -13408,7 +13492,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,30 +282,21 @@
+@@ -381,30 +282,21 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -13448,7 +13532,7 @@
TEST_PROGS =
### testing rules
-@@ -426,31 +322,39 @@
+@@ -430,31 +322,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -13477,8 +13561,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -13507,7 +13591,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -458,10 +362,6 @@
+@@ -462,10 +362,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -13518,7 +13602,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -469,7 +369,13 @@
+@@ -473,7 +369,13 @@
# (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):
@@ -13533,7 +13617,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -481,15 +387,20 @@
+@@ -485,15 +387,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13558,7 +13642,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -510,7 +421,7 @@
+@@ -514,7 +421,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13567,7 +13651,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -521,35 +432,30 @@
+@@ -525,35 +432,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -13586,7 +13670,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -13610,7 +13694,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -557,23 +463,23 @@
+@@ -561,23 +463,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -13643,7 +13727,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -585,29 +491,23 @@
+@@ -589,29 +491,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -13686,7 +13770,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -618,15 +518,19 @@
+@@ -622,15 +518,19 @@
|| exit 1; \
fi; \
done
@@ -13711,7 +13795,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -637,7 +541,6 @@
+@@ -641,7 +541,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -13719,7 +13803,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -657,7 +560,7 @@
+@@ -661,7 +560,7 @@
clean-generic:
distclean-generic:
@@ -13728,7 +13812,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -668,25 +571,34 @@
+@@ -672,25 +571,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -13765,7 +13849,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -705,26 +617,24 @@
+@@ -709,26 +617,24 @@
ps-am:
@@ -13808,12 +13892,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.16.1/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.16.1.old/docs/reference/gdk/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/reference/gdk/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.16.2/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/reference/gdk/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/reference/gdk/Makefile.in 2009-06-02 07:42:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -13929,7 +14013,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -155,91 +151,14 @@
+@@ -155,95 +151,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -13948,6 +14032,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -14022,7 +14110,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -263,24 +182,15 @@
+@@ -267,24 +182,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -14048,7 +14136,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -293,8 +203,6 @@
+@@ -297,8 +203,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -14057,7 +14145,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -306,28 +214,10 @@
+@@ -310,28 +214,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -14086,7 +14174,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -336,22 +226,25 @@
+@@ -340,22 +226,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -14116,7 +14204,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -375,6 +268,7 @@
+@@ -379,6 +268,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -14124,7 +14212,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -383,22 +277,19 @@
+@@ -387,22 +277,19 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -14154,7 +14242,7 @@
TEST_PROGS =
### testing rules
-@@ -424,7 +315,6 @@
+@@ -428,7 +315,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -14162,7 +14250,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
-@@ -474,7 +364,6 @@
+@@ -478,7 +364,6 @@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@@ -14170,7 +14258,7 @@
GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
# Extra options to supply to gtkdoc-mkdb
-@@ -576,7 +465,6 @@
+@@ -580,7 +465,6 @@
--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -14178,7 +14266,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -589,13 +477,10 @@
+@@ -593,13 +477,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -14192,7 +14280,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -603,31 +488,45 @@
+@@ -607,31 +488,45 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -14220,8 +14308,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -14252,7 +14340,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -635,39 +534,29 @@
+@@ -639,39 +534,29 @@
clean-libtool:
-rm -rf .libs _libs
@@ -14305,7 +14393,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -685,7 +574,6 @@
+@@ -689,7 +574,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile all-local
@@ -14313,7 +14401,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -707,7 +595,7 @@
+@@ -711,7 +595,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -14322,7 +14410,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -718,25 +606,34 @@
+@@ -722,25 +606,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -14359,7 +14447,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -756,18 +653,23 @@
+@@ -760,18 +653,23 @@
ps-am:
@@ -14393,12 +14481,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.16.1/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.16.1.old/docs/reference/gdk-pixbuf/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/reference/gdk-pixbuf/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.16.2/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/reference/gdk-pixbuf/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/reference/gdk-pixbuf/Makefile.in 2009-06-02 07:42:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -14518,7 +14606,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -155,91 +155,14 @@
+@@ -155,95 +155,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -14537,6 +14625,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -14611,7 +14703,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -263,24 +186,15 @@
+@@ -267,24 +186,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -14637,7 +14729,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -293,8 +207,6 @@
+@@ -297,8 +207,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -14646,7 +14738,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -306,28 +218,10 @@
+@@ -310,28 +218,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -14675,7 +14767,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -336,22 +230,25 @@
+@@ -340,22 +230,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -14705,7 +14797,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -375,6 +272,7 @@
+@@ -379,6 +272,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -14713,7 +14805,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -383,28 +281,20 @@
+@@ -387,28 +281,20 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -14750,7 +14842,7 @@
TEST_PROGS =
### testing rules
-@@ -430,7 +320,6 @@
+@@ -434,7 +320,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -14758,7 +14850,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
-@@ -462,7 +351,6 @@
+@@ -466,7 +351,6 @@
xpm-color-table.h \
test-images.h
@@ -14766,7 +14858,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-@@ -470,7 +358,6 @@
+@@ -474,7 +358,6 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -14774,7 +14866,7 @@
GTKDOC_LIBS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
-@@ -500,7 +387,6 @@
+@@ -504,7 +387,6 @@
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -14782,7 +14874,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -513,13 +399,10 @@
+@@ -517,13 +399,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -14796,7 +14888,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -527,40 +410,49 @@
+@@ -531,40 +410,49 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -14811,9 +14903,9 @@
-
########################################################################
- man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
--
- BUILT_EXTRA_DIST = $(man_MANS)
+ @ENABLE_MAN_TRUE at man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
+-
+ @ENABLE_MAN_TRUE at BUILT_EXTRA_DIST = $(man_MANS)
-subdir = docs/reference/gdk-pixbuf
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -14833,8 +14925,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -14865,7 +14957,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -568,15 +460,9 @@
+@@ -572,15 +460,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -14882,7 +14974,18 @@
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -595,8 +481,8 @@
+@@ -589,8 +471,8 @@
+ esac; \
+ done; \
+ for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+@@ -599,8 +481,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -14893,7 +14996,7 @@
done
uninstall-man1:
@$(NORMAL_UNINSTALL)
-@@ -616,8 +502,8 @@
+@@ -620,8 +502,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -14904,7 +15007,7 @@
done
tags: TAGS
TAGS:
-@@ -625,29 +511,23 @@
+@@ -629,29 +511,23 @@
ctags: CTAGS
CTAGS:
@@ -14947,7 +15050,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -665,9 +545,10 @@
+@@ -669,9 +545,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(MANS) all-local
@@ -14960,7 +15063,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -688,7 +569,7 @@
+@@ -692,7 +569,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -14969,7 +15072,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -699,25 +580,34 @@
+@@ -703,25 +580,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -15006,7 +15109,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -737,21 +627,25 @@
+@@ -741,21 +627,25 @@
ps-am:
@@ -15041,12 +15144,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/reference/gtk/Makefile.in gtk+2.0-2.16.1/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.16.1.old/docs/reference/gtk/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/reference/gtk/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.16.2/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/reference/gtk/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/reference/gtk/Makefile.in 2009-06-02 07:42:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -15170,7 +15273,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -158,91 +155,14 @@
+@@ -158,95 +155,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -15189,6 +15292,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -15263,7 +15370,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -266,24 +186,15 @@
+@@ -270,24 +186,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -15289,7 +15396,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -296,8 +207,6 @@
+@@ -300,8 +207,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -15298,7 +15405,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -309,28 +218,10 @@
+@@ -313,28 +218,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -15327,7 +15434,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -339,22 +230,25 @@
+@@ -343,22 +230,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -15357,7 +15464,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -378,6 +272,7 @@
+@@ -382,6 +272,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -15365,7 +15472,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -386,22 +281,19 @@
+@@ -390,22 +281,19 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15395,7 +15502,7 @@
TEST_PROGS =
### testing rules
-@@ -427,7 +319,6 @@
+@@ -431,7 +319,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -15403,7 +15510,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
-@@ -533,7 +424,6 @@
+@@ -537,7 +424,6 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -15411,7 +15518,7 @@
GTKDOC_LIBS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
-@@ -580,7 +470,6 @@
+@@ -584,7 +470,6 @@
gtk-builder-convert.xml \
visual_index.xml
@@ -15419,7 +15526,7 @@
expand_content_files = \
drawing-model.xml \
glossary.xml \
-@@ -784,7 +673,6 @@
+@@ -788,7 +673,6 @@
--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -15427,7 +15534,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -797,13 +685,10 @@
+@@ -801,13 +685,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -15441,7 +15548,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -811,40 +696,49 @@
+@@ -815,40 +696,49 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -15456,9 +15563,9 @@
-
########################################################################
- man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
--
- BUILT_EXTRA_DIST = $(man_MANS)
+ @ENABLE_MAN_TRUE at man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+-
+ @ENABLE_MAN_TRUE at BUILT_EXTRA_DIST = $(man_MANS)
-subdir = docs/reference/gtk
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -15478,8 +15585,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -15510,7 +15617,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -852,15 +746,9 @@
+@@ -856,15 +746,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15527,7 +15634,18 @@
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -879,8 +767,8 @@
+@@ -873,8 +757,8 @@
+ esac; \
+ done; \
+ for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+@@ -883,8 +767,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -15538,7 +15656,7 @@
done
uninstall-man1:
@$(NORMAL_UNINSTALL)
-@@ -900,8 +788,8 @@
+@@ -904,8 +788,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -15549,7 +15667,7 @@
done
tags: TAGS
TAGS:
-@@ -909,29 +797,23 @@
+@@ -913,29 +797,23 @@
ctags: CTAGS
CTAGS:
@@ -15592,7 +15710,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -949,9 +831,10 @@
+@@ -953,9 +831,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(MANS) all-local
@@ -15605,7 +15723,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -972,7 +855,7 @@
+@@ -976,7 +855,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -15614,7 +15732,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -983,25 +866,34 @@
+@@ -987,25 +866,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -15651,7 +15769,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1021,21 +913,25 @@
+@@ -1025,21 +913,25 @@
ps-am:
@@ -15686,12 +15804,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.16.1/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.16.1.old/docs/reference/libgail-util/Makefile.in 2009-04-11 21:55:29.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/reference/libgail-util/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.16.2/docs/reference/libgail-util/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/reference/libgail-util/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/reference/libgail-util/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -15806,7 +15924,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -155,91 +150,14 @@
+@@ -155,95 +150,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -15825,6 +15943,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -15899,7 +16021,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -263,24 +181,15 @@
+@@ -267,24 +181,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -15925,7 +16047,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -293,8 +202,6 @@
+@@ -297,8 +202,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -15934,7 +16056,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -306,28 +213,10 @@
+@@ -310,28 +213,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -15963,7 +16085,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -336,22 +225,25 @@
+@@ -340,22 +225,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -15993,7 +16115,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -375,6 +267,7 @@
+@@ -379,6 +267,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -16001,7 +16123,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -383,13 +276,14 @@
+@@ -387,13 +276,14 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16019,7 +16141,7 @@
EXTRA_DIST = \
$(content_files) \
$(HTML_IMAGES) \
-@@ -422,7 +316,6 @@
+@@ -426,7 +316,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -16027,7 +16149,7 @@
AUTOMAKE_OPTIONS = 1.7
# The name of the module.
-@@ -445,16 +338,13 @@
+@@ -449,16 +338,13 @@
-I$(top_builddir) \
$(DEP_CFLAGS)
@@ -16044,7 +16166,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -467,13 +357,10 @@
+@@ -471,13 +357,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -16058,7 +16180,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -481,69 +368,73 @@
+@@ -485,69 +368,73 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -16086,8 +16208,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -16168,7 +16290,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -561,7 +452,6 @@
+@@ -565,7 +452,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile all-local
@@ -16176,7 +16298,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -583,7 +473,7 @@
+@@ -587,7 +473,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -16185,7 +16307,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -594,25 +484,34 @@
+@@ -598,25 +484,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -16222,7 +16344,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -632,18 +531,23 @@
+@@ -636,18 +531,23 @@
ps-am:
@@ -16256,12 +16378,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/reference/Makefile.in gtk+2.0-2.16.1/docs/reference/Makefile.in
---- gtk+2.0-2.16.1.old/docs/reference/Makefile.in 2009-04-11 21:55:28.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/reference/Makefile.in 2009-04-12 11:21:18.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/reference/Makefile.in gtk+2.0-2.16.2/docs/reference/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/reference/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/reference/Makefile.in 2009-06-02 07:42:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -16388,7 +16510,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +156,14 @@
+@@ -149,95 +156,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -16407,6 +16529,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -16481,7 +16607,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +187,15 @@
+@@ -261,24 +187,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -16507,7 +16633,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +208,6 @@
+@@ -291,8 +208,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -16516,7 +16642,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +219,10 @@
+@@ -304,28 +219,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -16545,7 +16671,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +231,25 @@
+@@ -334,22 +231,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -16575,7 +16701,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +273,7 @@
+@@ -373,6 +273,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -16583,7 +16709,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +282,12 @@
+@@ -381,9 +282,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16597,7 +16723,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,31 +318,39 @@
+@@ -414,31 +318,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -16626,8 +16752,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -16656,7 +16782,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +358,6 @@
+@@ -446,10 +358,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16667,7 +16793,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -453,7 +365,13 @@
+@@ -457,7 +365,13 @@
# (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):
@@ -16682,7 +16808,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +383,20 @@
+@@ -469,15 +383,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -16707,7 +16833,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +417,7 @@
+@@ -498,7 +417,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -16716,7 +16842,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +428,30 @@
+@@ -509,35 +428,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -16735,7 +16861,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -16759,7 +16885,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +459,23 @@
+@@ -545,23 +459,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16792,7 +16918,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +487,23 @@
+@@ -573,29 +487,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -16835,7 +16961,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +514,19 @@
+@@ -606,15 +514,19 @@
|| exit 1; \
fi; \
done
@@ -16860,7 +16986,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +537,6 @@
+@@ -625,7 +537,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -16868,7 +16994,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +556,7 @@
+@@ -645,7 +556,7 @@
clean-generic:
distclean-generic:
@@ -16877,7 +17003,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +567,34 @@
+@@ -656,25 +567,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -16914,7 +17040,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +613,24 @@
+@@ -693,26 +613,24 @@
ps-am:
@@ -16957,12 +17083,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/tools/Makefile.in gtk+2.0-2.16.1/docs/tools/Makefile.in
---- gtk+2.0-2.16.1.old/docs/tools/Makefile.in 2009-04-11 21:55:29.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/tools/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/tools/Makefile.in gtk+2.0-2.16.2/docs/tools/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/tools/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/tools/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -17099,7 +17225,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +168,14 @@
+@@ -149,95 +168,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -17118,6 +17244,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -17192,7 +17322,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +199,15 @@
+@@ -261,24 +199,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -17218,7 +17348,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +220,6 @@
+@@ -291,8 +220,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -17227,7 +17357,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +231,10 @@
+@@ -304,28 +231,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -17256,7 +17386,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +243,25 @@
+@@ -334,22 +243,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -17286,7 +17416,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +285,7 @@
+@@ -373,6 +285,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -17294,7 +17424,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +294,12 @@
+@@ -381,9 +294,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -17308,7 +17438,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,7 +330,6 @@
+@@ -414,7 +330,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -17316,7 +17446,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -419,24 +338,17 @@
+@@ -423,24 +338,17 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -17341,7 +17471,7 @@
doc_shooter_DEPENDENCIES = $(DEPS)
doc_shooter_LDADD = $(LDADDS)
doc_shooter_SOURCES = \
-@@ -446,46 +358,39 @@
+@@ -450,46 +358,39 @@
widgets.c \
widgets.h
@@ -17385,8 +17515,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -17415,7 +17545,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -495,10 +400,10 @@
+@@ -499,10 +400,10 @@
done
doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES)
@rm -f doc-shooter$(EXEEXT)
@@ -17428,7 +17558,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -508,37 +413,25 @@
+@@ -512,37 +413,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widgets.Po at am__quote@
.c.o:
@@ -17478,7 +17608,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -546,26 +439,15 @@
+@@ -550,26 +439,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -17501,14 +17631,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -575,23 +457,23 @@
+@@ -579,23 +457,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17541,7 +17671,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -603,29 +485,23 @@
+@@ -607,29 +485,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -17584,7 +17714,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -640,7 +516,6 @@
+@@ -644,7 +516,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -17592,7 +17722,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -661,7 +536,7 @@
+@@ -665,7 +536,7 @@
clean-generic:
distclean-generic:
@@ -17601,7 +17731,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -675,24 +550,34 @@
+@@ -679,24 +550,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -17637,7 +17767,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -713,19 +598,23 @@
+@@ -717,19 +598,23 @@
ps-am:
@@ -17670,12 +17800,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/docs/tutorial/Makefile.in gtk+2.0-2.16.1/docs/tutorial/Makefile.in
---- gtk+2.0-2.16.1.old/docs/tutorial/Makefile.in 2009-04-11 21:55:29.000000000 +0200
-+++ gtk+2.0-2.16.1/docs/tutorial/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/docs/tutorial/Makefile.in gtk+2.0-2.16.2/docs/tutorial/Makefile.in
+--- gtk+2.0-2.16.2.old/docs/tutorial/Makefile.in 2009-05-31 06:11:02.000000000 +0200
++++ gtk+2.0-2.16.2/docs/tutorial/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -17790,7 +17920,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +144,14 @@
+@@ -149,95 +144,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -17809,6 +17939,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -17883,7 +18017,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +175,15 @@
+@@ -261,24 +175,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -17909,7 +18043,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +196,6 @@
+@@ -291,8 +196,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -17918,7 +18052,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +207,10 @@
+@@ -304,28 +207,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -17947,7 +18081,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +219,25 @@
+@@ -334,22 +219,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -17977,7 +18111,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +261,7 @@
+@@ -373,6 +261,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -17985,7 +18119,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,47 +270,28 @@
+@@ -381,47 +270,28 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18048,7 +18182,7 @@
TEST_PROGS =
### testing rules
-@@ -443,61 +317,67 @@
+@@ -447,61 +317,67 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -18068,8 +18202,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -18150,7 +18284,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -515,7 +395,6 @@
+@@ -519,7 +395,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile
@@ -18158,7 +18292,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -536,7 +415,7 @@
+@@ -540,7 +415,7 @@
clean-generic:
distclean-generic:
@@ -18167,7 +18301,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -547,7 +426,7 @@
+@@ -551,7 +426,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -18176,7 +18310,7 @@
dvi: dvi-am
-@@ -559,12 +438,20 @@
+@@ -563,12 +438,20 @@
install-data-am:
@@ -18197,7 +18331,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -575,25 +462,27 @@
+@@ -579,25 +462,27 @@
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
@@ -18236,12 +18370,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/directfb/Makefile.in gtk+2.0-2.16.1/gdk/directfb/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/directfb/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/directfb/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/directfb/Makefile.in gtk+2.0-2.16.2/gdk/directfb/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/directfb/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/directfb/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -18393,7 +18527,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +183,14 @@
+@@ -149,95 +183,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -18412,6 +18546,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -18486,7 +18624,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +214,15 @@
+@@ -261,24 +214,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -18512,7 +18650,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +235,6 @@
+@@ -291,8 +235,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -18521,7 +18659,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +246,10 @@
+@@ -304,28 +246,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -18550,7 +18688,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +258,25 @@
+@@ -334,22 +258,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -18580,7 +18718,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +300,7 @@
+@@ -373,6 +300,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -18588,7 +18726,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,14 +309,17 @@
+@@ -381,14 +309,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18608,7 +18746,7 @@
TEST_PROGS =
### testing rules
-@@ -410,9 +345,7 @@
+@@ -414,9 +345,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -18618,7 +18756,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
-DGDK_COMPILATION \
-@@ -423,13 +356,10 @@
+@@ -427,13 +356,10 @@
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@
@@ -18632,7 +18770,7 @@
libgdk_directfb_la_SOURCES = \
gdkapplaunchcontext-directfb.c \
gdkcolor-directfb.c \
-@@ -462,98 +392,57 @@
+@@ -466,98 +392,57 @@
gdkwindowid.c \
x-cursors.xbm
@@ -18714,8 +18852,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -18761,7 +18899,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -585,82 +474,58 @@
+@@ -589,82 +474,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowid.Plo at am__quote@
.c.o:
@@ -18859,14 +18997,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -670,23 +535,23 @@
+@@ -674,23 +535,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18899,7 +19037,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -698,29 +563,23 @@
+@@ -702,29 +563,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -18942,7 +19080,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -735,9 +594,10 @@
+@@ -739,9 +594,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -18955,7 +19093,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -757,7 +617,7 @@
+@@ -761,7 +617,7 @@
clean-generic:
distclean-generic:
@@ -18964,7 +19102,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -771,24 +631,34 @@
+@@ -775,24 +631,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -19000,7 +19138,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -809,19 +679,23 @@
+@@ -813,19 +679,23 @@
ps-am:
@@ -19034,12 +19172,12 @@
uninstall-libgdkincludeHEADERS
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/Makefile.in gtk+2.0-2.16.1/gdk/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/Makefile.in gtk+2.0-2.16.2/gdk/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -19275,7 +19413,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +267,14 @@
+@@ -149,95 +267,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -19294,6 +19432,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -19368,7 +19510,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +298,15 @@
+@@ -261,24 +298,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -19394,7 +19536,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +319,6 @@
+@@ -291,8 +319,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -19403,7 +19545,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +330,10 @@
+@@ -304,28 +330,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -19432,7 +19574,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +342,25 @@
+@@ -334,22 +342,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -19462,7 +19604,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +384,7 @@
+@@ -373,6 +384,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -19470,7 +19612,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,32 +393,22 @@
+@@ -381,32 +393,22 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19513,7 +19655,7 @@
TEST_PROGS =
### testing rules
-@@ -428,10 +434,8 @@
+@@ -432,10 +434,8 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -19524,7 +19666,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-@@ -441,9 +445,7 @@
+@@ -445,9 +445,7 @@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@@ -19534,7 +19676,7 @@
@PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
# libtool stuff: set version and export symbols for resolving
-@@ -457,7 +459,6 @@
+@@ -461,7 +459,6 @@
$(LIBTOOL_EXPORT_OPTIONS)
@USE_MEDIALIB_FALSE at medialib_sources =
@@ -19542,7 +19684,7 @@
@USE_MEDIALIB_TRUE at medialib_sources = \
@USE_MEDIALIB_TRUE@ gdkmedialib.c
-@@ -501,15 +502,12 @@
+@@ -505,15 +502,12 @@
gdkvisual.h \
gdkwindow.h
@@ -19558,7 +19700,7 @@
gdk_c_sources = \
$(medialib_sources) \
gdk.c \
-@@ -546,7 +544,6 @@
+@@ -550,7 +544,6 @@
gdkwindow.c \
gdkwindowimpl.c
@@ -19566,7 +19708,7 @@
gdk_built_sources = \
gdkaliasdef.c \
gdkenumtypes.c \
-@@ -556,7 +553,6 @@
+@@ -560,7 +553,6 @@
$(gdk_built_private_headers)
@@ -19574,7 +19716,7 @@
#
# setup GDK sources and their dependencies
#
-@@ -569,40 +565,31 @@
+@@ -573,40 +565,31 @@
gdkenumtypes.c \
gdkmarshalers.h
@@ -19615,7 +19757,7 @@
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_HEADERS =
-@@ -616,183 +603,79 @@
+@@ -620,183 +603,79 @@
$(gdk_built_sources) \
gdkconfig.h
@@ -19757,8 +19899,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -19839,7 +19981,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -831,64 +714,47 @@
+@@ -835,64 +714,47 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowimpl.Plo at am__quote@
.c.o:
@@ -19923,7 +20065,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -898,7 +764,13 @@
+@@ -902,7 +764,13 @@
# (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):
@@ -19938,7 +20080,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -910,15 +782,20 @@
+@@ -914,15 +782,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19963,7 +20105,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -939,7 +816,7 @@
+@@ -943,7 +816,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19972,7 +20114,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -950,35 +827,30 @@
+@@ -954,35 +827,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -19991,7 +20133,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -20015,7 +20157,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -986,23 +858,23 @@
+@@ -990,23 +858,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20048,19 +20190,16 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1016,9 +888,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
+@@ -1022,7 +890,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1027,25 +899,25 @@
+@@ -1031,25 +899,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -20068,7 +20207,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -20084,7 +20223,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -20096,11 +20235,46 @@
;; \
esac; \
else \
-@@ -1070,46 +942,40 @@
+@@ -1057,63 +925,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -20160,7 +20334,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1122,13 +988,17 @@
+@@ -1126,13 +1001,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -20182,7 +20356,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -1140,8 +1010,9 @@
+@@ -1144,8 +1023,9 @@
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -20194,7 +20368,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -1162,14 +1033,14 @@
+@@ -1166,14 +1046,14 @@
clean-generic:
distclean-generic:
@@ -20211,7 +20385,7 @@
clean: clean-recursive
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-@@ -1179,26 +1050,36 @@
+@@ -1183,26 +1063,36 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -20249,7 +20423,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -1219,32 +1100,30 @@
+@@ -1223,32 +1113,30 @@
ps-am:
@@ -20304,12 +20478,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/quartz/Makefile.in gtk+2.0-2.16.1/gdk/quartz/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/quartz/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/quartz/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/quartz/Makefile.in gtk+2.0-2.16.2/gdk/quartz/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/quartz/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/quartz/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -20460,7 +20634,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +182,14 @@
+@@ -149,95 +182,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -20479,6 +20653,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -20553,7 +20731,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +213,15 @@
+@@ -261,24 +213,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -20579,7 +20757,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +234,6 @@
+@@ -291,8 +234,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -20588,7 +20766,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +245,10 @@
+@@ -304,28 +245,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -20617,7 +20795,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +257,25 @@
+@@ -334,22 +257,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -20647,7 +20825,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +299,7 @@
+@@ -373,6 +299,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -20655,7 +20833,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +308,12 @@
+@@ -381,9 +308,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20669,7 +20847,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +344,7 @@
+@@ -414,9 +344,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -20679,7 +20857,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-@@ -423,11 +355,8 @@
+@@ -427,11 +355,8 @@
$(GDK_DEP_CFLAGS) \
"-xobjective-c"
@@ -20691,7 +20869,7 @@
libgdk_quartz_la_SOURCES = \
GdkQuartzView.c \
GdkQuartzView.h \
-@@ -466,98 +395,56 @@
+@@ -470,98 +395,56 @@
gdkwindow-quartz.h \
xcursors.h
@@ -20773,8 +20951,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -20820,7 +20998,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -591,82 +478,58 @@
+@@ -595,82 +478,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-quartz.Plo at am__quote@
.c.o:
@@ -20918,14 +21096,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -676,23 +539,23 @@
+@@ -680,23 +539,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20958,7 +21136,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -704,29 +567,23 @@
+@@ -708,29 +567,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -21001,7 +21179,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -741,9 +598,10 @@
+@@ -745,9 +598,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -21014,7 +21192,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -763,7 +621,7 @@
+@@ -767,7 +621,7 @@
clean-generic:
distclean-generic:
@@ -21023,7 +21201,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -777,24 +635,34 @@
+@@ -781,24 +635,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -21059,7 +21237,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -815,19 +683,23 @@
+@@ -819,19 +683,23 @@
ps-am:
@@ -21093,12 +21271,12 @@
uninstall-libgdkincludeHEADERS
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/tests/Makefile.in gtk+2.0-2.16.1/gdk/tests/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/tests/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/tests/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/tests/Makefile.in gtk+2.0-2.16.2/gdk/tests/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/tests/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/tests/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -21216,7 +21394,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +147,14 @@
+@@ -149,95 +147,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -21235,6 +21413,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -21309,7 +21491,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +178,15 @@
+@@ -261,24 +178,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -21335,7 +21517,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +199,6 @@
+@@ -291,8 +199,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -21344,7 +21526,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +210,10 @@
+@@ -304,28 +210,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -21373,7 +21555,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +222,25 @@
+@@ -334,22 +222,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -21403,7 +21585,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +264,7 @@
+@@ -373,6 +264,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -21411,7 +21593,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +273,12 @@
+@@ -381,9 +273,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21425,7 +21607,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,21 +309,14 @@
+@@ -414,21 +309,14 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -21447,7 +21629,7 @@
check_gdk_cairo_SOURCES = \
check-gdk-cairo.c \
$(NULL)
-@@ -435,28 +327,42 @@
+@@ -439,28 +327,42 @@
$(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \
$(NULL)
@@ -21473,8 +21655,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -21503,7 +21685,7 @@
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; for p in $$list; do \
-@@ -470,10 +376,6 @@
+@@ -474,10 +376,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21514,19 +21696,16 @@
tags: TAGS
TAGS:
-@@ -482,9 +384,9 @@
-
-
+@@ -488,7 +386,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -493,25 +395,25 @@
+@@ -497,25 +395,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -21534,7 +21713,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -21550,7 +21729,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -21562,11 +21741,46 @@
;; \
esac; \
else \
-@@ -536,46 +438,40 @@
+@@ -523,63 +421,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -21626,7 +21840,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -591,7 +487,6 @@
+@@ -595,7 +500,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: check-am
all-am: Makefile
@@ -21634,7 +21848,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -613,35 +508,46 @@
+@@ -617,35 +521,46 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -21684,7 +21898,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -660,17 +566,21 @@
+@@ -664,17 +579,21 @@
ps-am:
@@ -21714,12 +21928,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/win32/Makefile.in gtk+2.0-2.16.1/gdk/win32/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/win32/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/win32/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/win32/Makefile.in gtk+2.0-2.16.2/gdk/win32/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/win32/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/win32/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -21880,7 +22094,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +192,14 @@
+@@ -149,95 +192,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -21899,6 +22113,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -21973,7 +22191,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +223,15 @@
+@@ -261,24 +223,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -21999,7 +22217,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +244,6 @@
+@@ -291,8 +244,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -22008,7 +22226,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +255,10 @@
+@@ -304,28 +255,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -22037,7 +22255,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +267,25 @@
+@@ -334,22 +267,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -22067,7 +22285,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +309,7 @@
+@@ -373,6 +309,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -22075,7 +22293,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,17 +318,17 @@
+@@ -381,17 +318,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22098,7 +22316,7 @@
TEST_PROGS =
### testing rules
-@@ -413,9 +354,7 @@
+@@ -417,9 +354,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -22108,7 +22326,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DINSIDE_GDK_WIN32 \
-@@ -427,13 +366,9 @@
+@@ -431,13 +366,9 @@
$(GDK_WIN32_EXTRA_CFLAGS)\
-DGDK_COMPILATION
@@ -22122,7 +22340,7 @@
libgdk_win32_la_SOURCES = \
xcursors.h \
gdkapplaunchcontext-win32.c \
-@@ -471,103 +406,56 @@
+@@ -475,103 +406,56 @@
wintab.h \
pktdef.h
@@ -22209,8 +22427,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -22256,7 +22474,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -600,64 +488,47 @@
+@@ -604,64 +488,47 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-win32.Plo at am__quote@
.c.o:
@@ -22340,7 +22558,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -667,7 +538,13 @@
+@@ -671,7 +538,13 @@
# (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):
@@ -22355,7 +22573,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -679,15 +556,20 @@
+@@ -683,15 +556,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22380,7 +22598,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -708,7 +590,7 @@
+@@ -712,7 +590,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22389,7 +22607,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -719,35 +601,30 @@
+@@ -723,35 +601,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -22408,7 +22626,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -22432,7 +22650,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -755,23 +632,23 @@
+@@ -759,23 +632,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22465,7 +22683,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -783,29 +660,23 @@
+@@ -787,29 +660,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -22508,7 +22726,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -816,15 +687,19 @@
+@@ -820,15 +687,19 @@
|| exit 1; \
fi; \
done
@@ -22533,7 +22751,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -835,8 +710,9 @@
+@@ -839,8 +710,9 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -22545,7 +22763,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -856,7 +732,7 @@
+@@ -860,7 +732,7 @@
clean-generic:
distclean-generic:
@@ -22554,7 +22772,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -870,24 +746,34 @@
+@@ -874,24 +746,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -22590,7 +22808,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -908,28 +794,26 @@
+@@ -912,28 +794,26 @@
ps-am:
@@ -22636,12 +22854,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/win32/rc/Makefile.in gtk+2.0-2.16.1/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/win32/rc/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/win32/rc/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.16.2/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/win32/rc/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/win32/rc/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -22756,7 +22974,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +146,14 @@
+@@ -149,95 +146,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -22775,6 +22993,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -22849,7 +23071,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +177,15 @@
+@@ -261,24 +177,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -22875,7 +23097,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +198,6 @@
+@@ -291,8 +198,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -22884,7 +23106,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +209,10 @@
+@@ -304,28 +209,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -22913,7 +23135,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +221,25 @@
+@@ -334,22 +221,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -22943,7 +23165,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +263,7 @@
+@@ -373,6 +263,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -22951,7 +23173,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,18 +272,17 @@
+@@ -381,18 +272,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22975,7 +23197,7 @@
TEST_PROGS =
### testing rules
-@@ -414,27 +308,40 @@
+@@ -418,27 +308,40 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -22999,8 +23221,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -23031,7 +23253,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -442,39 +349,29 @@
+@@ -446,39 +349,29 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23084,7 +23306,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -489,7 +386,6 @@
+@@ -493,7 +386,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -23092,7 +23314,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -510,7 +406,7 @@
+@@ -514,7 +406,7 @@
clean-generic:
distclean-generic:
@@ -23101,7 +23323,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -521,24 +417,34 @@
+@@ -525,24 +417,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -23137,7 +23359,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -557,17 +463,21 @@
+@@ -561,17 +463,21 @@
ps-am:
@@ -23167,12 +23389,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk/x11/Makefile.in gtk+2.0-2.16.1/gdk/x11/Makefile.in
---- gtk+2.0-2.16.1.old/gdk/x11/Makefile.in 2009-04-11 21:55:30.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk/x11/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk/x11/Makefile.in gtk+2.0-2.16.2/gdk/x11/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk/x11/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gdk/x11/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -23351,7 +23573,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -151,91 +210,14 @@
+@@ -151,95 +210,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -23370,6 +23592,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -23444,7 +23670,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -259,24 +241,15 @@
+@@ -263,24 +241,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -23470,7 +23696,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -289,8 +262,6 @@
+@@ -293,8 +262,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -23479,7 +23705,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -302,28 +273,10 @@
+@@ -306,28 +273,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -23508,7 +23734,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -332,22 +285,25 @@
+@@ -336,22 +285,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -23538,7 +23764,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -371,6 +327,7 @@
+@@ -375,6 +327,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -23546,7 +23772,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -379,9 +336,12 @@
+@@ -383,9 +336,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23560,7 +23786,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -389,12 +349,8 @@
+@@ -393,12 +349,8 @@
# We need to include all these C files here since the conditionals
# don't seem to be correctly expanded for the dist files.
@@ -23574,7 +23800,7 @@
TEST_PROGS =
### testing rules
-@@ -420,9 +376,7 @@
+@@ -424,9 +376,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -23584,7 +23810,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-@@ -432,178 +386,69 @@
+@@ -436,178 +386,69 @@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@@ -23762,8 +23988,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -23805,7 +24031,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -613,10 +458,10 @@
+@@ -617,10 +458,10 @@
done
checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES)
@rm -f checksettings$(EXEEXT)
@@ -23818,7 +24044,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -656,82 +501,58 @@
+@@ -660,82 +501,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsettings-common.Plo at am__quote@
.c.o:
@@ -23916,14 +24142,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -741,23 +562,23 @@
+@@ -745,23 +562,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -23956,19 +24182,16 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -771,9 +592,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
+@@ -777,7 +594,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -782,25 +603,25 @@
+@@ -786,25 +603,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -23976,7 +24199,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -23992,7 +24215,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -24004,11 +24227,46 @@
;; \
esac; \
else \
-@@ -825,46 +646,40 @@
+@@ -812,63 +629,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -24068,7 +24326,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -879,9 +694,10 @@
+@@ -883,9 +707,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
@@ -24081,7 +24339,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -901,7 +717,7 @@
+@@ -905,7 +730,7 @@
clean-generic:
distclean-generic:
@@ -24090,7 +24348,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -915,24 +731,34 @@
+@@ -919,24 +744,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -24126,7 +24384,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -953,20 +779,24 @@
+@@ -957,20 +792,24 @@
ps-am:
@@ -24160,12 +24418,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.16.1/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.16.1.old/gdk-pixbuf/Makefile.in 2009-04-11 21:55:29.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk-pixbuf/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.16.2/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk-pixbuf/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk-pixbuf/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -24195,7 +24453,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,1444 +35,1372 @@
+@@ -37,420 +35,850 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -24327,6 +24585,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -24592,318 +24854,6 @@
-
- at PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-
-- at OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def
-- at OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def
--
-- at OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
-- at OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
--
-- at OS_WIN32_TRUE@libole32 = -lole32
--
-- at MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
--
-- at OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh
--
--lib_LTLIBRARIES = \
-- libgdk_pixbuf-2.0.la
--
--
--loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
--
--module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
--
--#
--# The PNG loader
--#
--libstatic_pixbufloader_png_la_SOURCES = io-png.c
--libpixbufloader_png_la_SOURCES = io-png.c
--libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
--
--#
--# The BMP loader
--#
--libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c
--libpixbufloader_bmp_la_SOURCES = io-bmp.c
--libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_bmp_la_LIBADD = $(module_libs)
--
--#
--# The WBMP loader
--#
--libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c
--libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
--libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_wbmp_la_LIBADD = $(module_libs)
--
--#
--# The GIF loader
--#
--libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
--libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
--libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_gif_la_LIBADD = $(module_libs)
--
--#
--# The ICO loader
--#
--libstatic_pixbufloader_ico_la_SOURCES = io-ico.c
--libpixbufloader_ico_la_SOURCES = io-ico.c
--libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_ico_la_LIBADD = $(module_libs)
--
--#
--# The ANI loader
--#
--libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
--libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
--libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_ani_la_LIBADD = $(module_libs)
--
--#
--# The JPEG loader
--#
--libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c
--libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
--libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs)
--
--#
--# The PNM loader
--#
--libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c
--libpixbufloader_pnm_la_SOURCES = io-pnm.c
--libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_pnm_la_LIBADD = $(module_libs)
--
--#
--# The RAS loader
--#
--libstatic_pixbufloader_ras_la_SOURCES = io-ras.c
--libpixbufloader_ras_la_SOURCES = io-ras.c
--libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_ras_la_LIBADD = $(module_libs)
--
--#
--# The TIFF loader
--#
--libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
--libpixbufloader_tiff_la_SOURCES = io-tiff.c
--libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
--
--#
--# The XPM loader
--#
--libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c
--libpixbufloader_xpm_la_SOURCES = io-xpm.c
--libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_xpm_la_LIBADD = $(module_libs)
--
--#
--# The XBM loader
--#
--libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c
--libpixbufloader_xbm_la_SOURCES = io-xbm.c
--libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_xbm_la_LIBADD = $(module_libs)
--
--#
--# The TGA loader
--#
--libstatic_pixbufloader_tga_la_SOURCES = io-tga.c
--libpixbufloader_tga_la_SOURCES = io-tga.c
--libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_tga_la_LIBADD = $(module_libs)
--
--#
--# The .icns loader
--#
--libstatic_pixbufloader_icns_la_SOURCES = io-icns.c
--libpixbufloader_icns_la_SOURCES = io-icns.c
--libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_icns_la_LIBADD = $(module_libs)
--
--#
--# The PCX loader
--#
--libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c
--libpixbufloader_pcx_la_SOURCES = io-pcx.c
--libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_pcx_la_LIBADD = $(module_libs)
--
--#
--# The JPEG2000 loader
--#
--libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
--libpixbufloader_jasper_la_SOURCES = io-jasper.c
--libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
--
--
--# When building the GDI+ loader statically, we put the "common" objects
--# only in one of the archives to avoid duplicate definitions
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at STATIC_GDIPLUS_LIBS = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_ico_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_wmf_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_emf_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_bmp_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_gif_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_png_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_tiff_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at GDIPLUS_LIBS = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la
--
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32)
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_SOURCES = \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c
--
-- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
--
--
--# Loaders that aren't built if we build the GDI+ loader
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE at STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE at BMP_LIB = libpixbufloader-bmp.la
--
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE at STATIC_GIF_LIB = libstatic-pixbufloader-gif.la
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE at GIF_LIB = libpixbufloader-gif.la
+DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/gdk-pixbuf-features.h.in $(srcdir)/gdk_pixbuf.rc.in \
@@ -25700,9 +25650,7 @@
+top_srcdir = @top_srcdir@
+GTESTER = gtester # in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE at STATIC_ICO_LIB = libstatic-pixbufloader-ico.la
-- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE at ICO_LIB = libpixbufloader-ico.la
++
+# initialize variables for unconditional += appending
+EXTRA_DIST = gdk-pixbuf-csource.1 makefile.msc gdk-pixbuf.symbols \
+ makegdkpixbufalias.pl abicheck.sh pltcheck.sh gdk_pixbuf.def \
@@ -25710,13 +25658,9 @@
+ gdk-pixbuf-enum-types.c.template \
+ gdk-pixbuf-enum-types.h.template gen-color-table.pl
+TEST_PROGS =
-
-- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE at STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la
-- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE at JPEG_LIB = libpixbufloader-jpeg.la
++
+### testing rules
-
-- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE at STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la
-- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE at TIFF_LIB = libpixbufloader-tiff.la
++
+# Xvfb based test rules
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
@@ -25725,14 +25669,11 @@
+ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
+ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
+ 9995 9996 9997 9998 9999
-
++
+SKIP_GDKTARGET = \
+ test "$(gdktarget)" != "x11" \
+ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-
--# End of loaders not built if building GDI+ loader
-- at HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE at STATIC_PNG_LIB = libstatic-pixbufloader-png.la
-- at HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE at PNG_LIB = libpixbufloader-png.la
++
+XVFB_START = \
+ ${XVFB} -help 2>/dev/null 1>&2 \
+ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
@@ -25740,107 +25681,236 @@
+ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
-
++
++SUBDIRS = pixops
++ at PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
+ @OS_WIN32_TRUE at gdk_pixbuf_def = gdk_pixbuf.def
+ @OS_WIN32_TRUE at gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def
+-
+ @OS_WIN32_TRUE at gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
+ @OS_WIN32_TRUE at gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
+-
+ @OS_WIN32_TRUE at libole32 = -lole32
+-
+ @MS_LIB_AVAILABLE_TRUE at noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
+-
+ @OS_LINUX_TRUE at TESTS = abicheck.sh pltcheck.sh
+-
+ lib_LTLIBRARIES = \
+ 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)
+
+ #
+@@ -581,7 +1009,6 @@
+ libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
+ libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
+
+-
+ # When building the GDI+ loader statically, we put the "common" objects
+ # only in one of the archives to avoid duplicate definitions
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at STATIC_GDIPLUS_LIBS = \
+@@ -593,7 +1020,6 @@
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_ico_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \
+@@ -603,35 +1029,27 @@
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_wmf_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_emf_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_bmp_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_gif_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_png_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_tiff_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at GDIPLUS_LIBS = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \
+@@ -641,7 +1059,6 @@
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la
+
+-
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_SOURCES = \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+@@ -649,836 +1066,341 @@
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+ @BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32)
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_SOURCES = \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c
+-
+- at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
+-
+-
+-# Loaders that aren't built if we build the GDI+ loader
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE at STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE at BMP_LIB = libpixbufloader-bmp.la
+-
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE at STATIC_GIF_LIB = libstatic-pixbufloader-gif.la
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE at GIF_LIB = libpixbufloader-gif.la
+-
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE at STATIC_ICO_LIB = libstatic-pixbufloader-ico.la
+- at BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE at ICO_LIB = libpixbufloader-ico.la
+-
+- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE at STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la
+- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE at JPEG_LIB = libpixbufloader-jpeg.la
+-
+- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE at STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la
+- at BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE at TIFF_LIB = libpixbufloader-tiff.la
+-
+-
+-# End of loaders not built if building GDI+ loader
+- at HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE at STATIC_PNG_LIB = libstatic-pixbufloader-png.la
+- at HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE at PNG_LIB = libpixbufloader-png.la
+-
- at INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la
- at INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la
-+SUBDIRS = pixops
-+ at PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-+ at OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def
-+ at OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def
-+ at OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
-+ at OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
-+ at OS_WIN32_TRUE@libole32 = -lole32
-+ at MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
-+ at OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh
-+lib_LTLIBRARIES = \
-+ libgdk_pixbuf-2.0.la
-
+-
- at INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la
- at INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.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)
-
+-
- at INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la
- at INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la
-+#
-+# The PNG loader
-+#
-+libstatic_pixbufloader_png_la_SOURCES = io-png.c
-+libpixbufloader_png_la_SOURCES = io-png.c
-+libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
-
+-
- at INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la
- at INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la
-+#
-+# The BMP loader
-+#
-+libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c
-+libpixbufloader_bmp_la_SOURCES = io-bmp.c
-+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_bmp_la_LIBADD = $(module_libs)
-
+-
- at INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la
- at INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la
-+#
-+# The WBMP loader
-+#
-+libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c
-+libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
-+libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_wbmp_la_LIBADD = $(module_libs)
-
+-
- at INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la
- at INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la
-+#
-+# The GIF loader
-+#
-+libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
-+libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
-+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_gif_la_LIBADD = $(module_libs)
-
+-
- at INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la
- at INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la
-+#
-+# The ICO loader
-+#
-+libstatic_pixbufloader_ico_la_SOURCES = io-ico.c
-+libpixbufloader_ico_la_SOURCES = io-ico.c
-+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_ico_la_LIBADD = $(module_libs)
-
+-
- at INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la
- at INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la
-+#
-+# The ANI loader
-+#
-+libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
-+libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
-+libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_ani_la_LIBADD = $(module_libs)
-
+-
- at INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la
- at INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la
-+#
-+# The JPEG loader
-+#
-+libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c
-+libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
-+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs)
-
+-
- at HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE at STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la
- at HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE at JASPER_LIB = libpixbufloader-jasper.la
-+#
-+# The PNM loader
-+#
-+libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c
-+libpixbufloader_pnm_la_SOURCES = io-pnm.c
-+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_pnm_la_LIBADD = $(module_libs)
-
+-
- at BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \
- at BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \
- at BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \
@@ -25859,22 +25929,8 @@
- at BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \
- at BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \
- at BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS)
-+#
-+# The RAS loader
-+#
-+libstatic_pixbufloader_ras_la_SOURCES = io-ras.c
-+libpixbufloader_ras_la_SOURCES = io-ras.c
-+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_ras_la_LIBADD = $(module_libs)
-
-+#
-+# The TIFF loader
-+#
-+libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
-+libpixbufloader_tiff_la_SOURCES = io-tiff.c
-+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
-
+-
+-
-noinst_LTLIBRARIES = \
- $(STATIC_PNG_LIB) \
- $(STATIC_BMP_LIB) \
@@ -25893,31 +25949,10 @@
- $(STATIC_PCX_LIB) \
- $(STATIC_JASPER_LIB) \
- $(STATIC_GDIPLUS_LIBS)
-+#
-+# The XPM loader
-+#
-+libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c
-+libpixbufloader_xpm_la_SOURCES = io-xpm.c
-+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_xpm_la_LIBADD = $(module_libs)
-
-+#
-+# The XBM loader
-+#
-+libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c
-+libpixbufloader_xbm_la_SOURCES = io-xbm.c
-+libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_xbm_la_LIBADD = $(module_libs)
-
+-
+-
-builtin_objs = @INCLUDED_LOADER_OBJ@
-+#
-+# The TGA loader
-+#
-+libstatic_pixbufloader_tga_la_SOURCES = io-tga.c
-+libpixbufloader_tga_la_SOURCES = io-tga.c
-+libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_tga_la_LIBADD = $(module_libs)
-
+-
-DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
-INCLUDES = \
- -DG_LOG_DOMAIN=\"GdkPixbuf\" \
@@ -25933,66 +25968,23 @@
- $(GTK_DEBUG_FLAGS) \
- $(GDK_PIXBUF_DEP_CFLAGS) \
- -DGDK_PIXBUF_ENABLE_BACKEND
-+#
-+# The .icns loader
-+#
-+libstatic_pixbufloader_icns_la_SOURCES = io-icns.c
-+libpixbufloader_icns_la_SOURCES = io-icns.c
-+libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_icns_la_LIBADD = $(module_libs)
-
-+#
-+# The PCX loader
-+#
-+libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c
-+libpixbufloader_pcx_la_SOURCES = io-pcx.c
-+libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_pcx_la_LIBADD = $(module_libs)
-
+-
+-
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
-+#
-+# The JPEG2000 loader
-+#
-+libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
-+libpixbufloader_jasper_la_SOURCES = io-jasper.c
-+libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
-+libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
-
+-
-noinst_PROGRAMS = test-gdk-pixbuf
-test_gdk_pixbuf_LDADD = $(LDADDS)
-+# When building the GDI+ loader statically, we put the "common" objects
-+# only in one of the archives to avoid duplicate definitions
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at STATIC_GDIPLUS_LIBS = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la
-
+-
-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_ico_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c
-
+-
-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_wmf_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c
-
+-
-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_emf_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c
-
+-
-#
-# The GdkPixBuf library
-#
@@ -26010,29 +26002,19 @@
- gdk-pixbuf-util.c \
- gdk-pixdata.c \
- gdk-pixbuf-enum-types.c
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_bmp_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c
-
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_gif_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c
-
+-
+-
-libgdk_pixbuf_2_0_la_LDFLAGS = \
- $(gdk_pixbuf_win32_res_ldflag) \
- -version-info $(LT_VERSION_INFO) \
- $(LIBTOOL_EXPORT_OPTIONS) \
- $(no_undefined) \
- $(gdk_pixbuf_symbols)
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c
-
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_png_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c
-
+-
+-
-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE at libstatic_pixbufloader_gdip_tiff_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c
-
+-
-gdk_pixbuf_headers = \
- gdk-pixbuf.h \
- gdk-pixbuf-core.h \
@@ -26041,22 +26023,7 @@
- gdk-pixbuf-animation.h \
- gdk-pixbuf-simple-anim.h \
- gdk-pixbuf-loader.h
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at GDIPLUS_LIBS = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la
-
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE at libpixbufloader_gdip_ico_la_SOURCES = \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \
-+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \
+-
+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \
+ at BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c
@@ -26807,8 +26774,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -26912,7 +26879,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -1483,116 +1409,115 @@
+@@ -1487,116 +1409,115 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -27080,7 +27047,7 @@
else :; fi; \
done
-@@ -1600,8 +1525,8 @@
+@@ -1604,8 +1525,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -27091,7 +27058,7 @@
done
clean-binPROGRAMS:
-@@ -1619,16 +1544,16 @@
+@@ -1623,16 +1544,16 @@
done
gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES)
@rm -f gdk-pixbuf-csource$(EXEEXT)
@@ -27112,7 +27079,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -1676,64 +1601,47 @@
+@@ -1680,64 +1601,47 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-gdk-pixbuf.Po at am__quote@
.c.o:
@@ -27196,7 +27163,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -1743,7 +1651,13 @@
+@@ -1747,7 +1651,13 @@
# (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):
@@ -27211,7 +27178,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1755,15 +1669,20 @@
+@@ -1759,15 +1669,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -27236,7 +27203,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1784,7 +1703,7 @@
+@@ -1788,7 +1703,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -27245,7 +27212,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1795,35 +1714,30 @@
+@@ -1799,35 +1714,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -27264,7 +27231,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -27288,7 +27255,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -1831,23 +1745,23 @@
+@@ -1835,23 +1745,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27321,19 +27288,16 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1861,9 +1775,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
+@@ -1867,7 +1777,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1872,25 +1786,25 @@
+@@ -1876,25 +1786,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -27341,7 +27305,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -27357,7 +27321,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -27369,11 +27333,46 @@
;; \
esac; \
else \
-@@ -1915,46 +1829,40 @@
+@@ -1902,63 +1812,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -27433,7 +27432,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1965,15 +1873,19 @@
+@@ -1969,15 +1886,19 @@
|| exit 1; \
fi; \
done
@@ -27458,7 +27457,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -1982,13 +1894,16 @@
+@@ -1986,13 +1907,16 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
@@ -27478,7 +27477,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -2010,13 +1925,13 @@
+@@ -2014,13 +1938,13 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -27494,7 +27493,7 @@
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -2027,12 +1942,14 @@
+@@ -2031,12 +1955,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -27510,7 +27509,7 @@
info: info-recursive
info-am:
-@@ -2042,12 +1959,20 @@
+@@ -2046,12 +1972,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -27531,7 +27530,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2068,35 +1993,34 @@
+@@ -2072,35 +2006,34 @@
ps-am:
@@ -27592,12 +27591,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.16.1/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.16.1.old/gdk-pixbuf/pixops/Makefile.in 2009-04-11 21:55:29.000000000 +0200
-+++ gtk+2.0-2.16.1/gdk-pixbuf/pixops/Makefile.in 2009-04-12 11:21:19.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.16.2/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.16.2.old/gdk-pixbuf/pixops/Makefile.in 2009-05-31 06:11:03.000000000 +0200
++++ gtk+2.0-2.16.2/gdk-pixbuf/pixops/Makefile.in 2009-06-02 07:42:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -27748,7 +27747,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +182,14 @@
+@@ -149,95 +182,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -27767,6 +27766,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -27841,7 +27844,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +213,15 @@
+@@ -261,24 +213,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -27867,7 +27870,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +234,6 @@
+@@ -291,8 +234,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -27876,7 +27879,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +245,10 @@
+@@ -304,28 +245,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -27905,7 +27908,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +257,25 @@
+@@ -334,22 +257,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -27935,7 +27938,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +299,7 @@
+@@ -373,6 +299,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -27943,7 +27946,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,18 +308,17 @@
+@@ -381,18 +308,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -27967,7 +27970,7 @@
TEST_PROGS =
### testing rules
-@@ -414,97 +344,70 @@
+@@ -418,97 +344,70 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -28051,8 +28054,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -28094,7 +28097,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -514,58 +417,62 @@
+@@ -518,58 +417,62 @@
done
timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES)
@rm -f timescale$(EXEEXT)
@@ -28186,7 +28189,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -573,26 +480,15 @@
+@@ -577,26 +480,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -28209,14 +28212,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -602,23 +498,23 @@
+@@ -606,23 +498,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28249,7 +28252,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -630,29 +526,23 @@
+@@ -634,29 +526,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -28292,7 +28295,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -667,7 +557,6 @@
+@@ -671,7 +557,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
@@ -28300,7 +28303,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -688,7 +577,7 @@
+@@ -692,7 +577,7 @@
clean-generic:
distclean-generic:
@@ -28309,7 +28312,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -702,24 +591,34 @@
+@@ -706,24 +591,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -28345,7 +28348,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -740,19 +639,23 @@
+@@ -744,19 +639,23 @@
ps-am:
@@ -28375,12 +28378,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gtk/Makefile.in gtk+2.0-2.16.1/gtk/Makefile.in
---- gtk+2.0-2.16.1.old/gtk/Makefile.in 2009-04-11 21:55:31.000000000 +0200
-+++ gtk+2.0-2.16.1/gtk/Makefile.in 2009-04-12 11:21:20.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gtk/Makefile.in gtk+2.0-2.16.2/gtk/Makefile.in
+--- gtk+2.0-2.16.2.old/gtk/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gtk/Makefile.in 2009-06-02 07:42:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -28425,7 +28428,7 @@
@OS_LINUX_TRUE at am__append_1 = abicheck.sh pltcheck.sh
@HAVE_INCLUDED_IMMMODULES_TRUE at am__append_2 = $(INCLUDED_IMMODULE_OBJ)
@HAVE_INCLUDED_IMMMODULES_TRUE at am__append_3 = $(INCLUDED_IMMODULE_OBJ)
-@@ -61,1767 +66,953 @@
+@@ -61,1438 +66,34 @@
@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_12 = gtksearchenginequartz.h
@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_13 = $(gtk_use_quartz_c_sources)
@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_14 = $(gtk_use_stub_c_sources)
@@ -28555,6 +28558,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -28839,9 +28846,11 @@
-
-SUBDIRS = theme-bits . tests
-DIST_SUBDIRS = theme-bits tests
-- at HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr
--
-- at HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups
+- at HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE at GTK_PRINT_BACKENDS = file,papi
+- at HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE at GTK_PRINT_BACKENDS = file,lpr
+- at HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE at GTK_PRINT_BACKENDS = file,cups
+-
+- at HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
-
-INCLUDES = \
- -DG_LOG_DOMAIN=\"Gtk\" \
@@ -29808,17 +29817,57 @@
- stock-icons/48/gtk-dialog-info.png \
- stock-icons/48/gtk-dialog-question.png \
- stock-icons/48/gtk-dialog-warning.png
+-
+-
+-GENERATED_ICONS = \
+- stock-icons/16/gtk-go-back-rtl.png \
+- stock-icons/16/gtk-go-forward-rtl.png \
+- stock-icons/16/gtk-goto-first-rtl.png \
+- stock-icons/16/gtk-goto-last-rtl.png \
+- stock-icons/16/gtk-media-forward-rtl.png \
+- stock-icons/16/gtk-media-next-rtl.png \
+- stock-icons/16/gtk-media-previous-rtl.png \
+- stock-icons/16/gtk-media-rewind-rtl.png \
+- stock-icons/16/gtk-save.png \
+- stock-icons/16/drive-harddisk.png \
+- stock-icons/16/folder.png \
+- stock-icons/16/folder-remote.png \
+- stock-icons/16/user-home.png \
+- stock-icons/16/user-desktop.png \
+- stock-icons/16/text-x-generic.png \
+- stock-icons/24/gtk-go-back-rtl.png \
+- stock-icons/24/gtk-go-forward-rtl.png \
+- stock-icons/24/gtk-goto-first-rtl.png \
+- stock-icons/24/gtk-goto-last-rtl.png \
+- stock-icons/24/gtk-media-forward-rtl.png \
+- stock-icons/24/gtk-media-next-rtl.png \
+- stock-icons/24/gtk-media-previous-rtl.png \
+- stock-icons/24/gtk-media-rewind-rtl.png \
+- stock-icons/24/gtk-save.png \
+- stock-icons/24/drive-harddisk.png \
+- stock-icons/24/folder.png \
+- stock-icons/24/folder-remote.png \
+- stock-icons/24/user-home.png \
+- stock-icons/24/user-desktop.png \
+- stock-icons/24/text-x-generic.png
+-
+-
+- at CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+- at CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
+- at CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
+- at CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
+-
+bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
+ gtk-update-icon-cache$(EXEEXT)
-+subdir = gtk
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ subdir = gtk
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -29829,37 +29878,33 @@
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" \
+ "$(DESTDIR)$(gtkunixprintincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-
+am__DEPENDENCIES_1 =
+ at HAVE_INCLUDED_IMMMODULES_TRUE@am__DEPENDENCIES_2 = \
+ at HAVE_INCLUDED_IMMMODULES_TRUE@ $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
-+am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-+ gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-+ gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-+ gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-+ gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-+ gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-+ gtkcellrendereraccel.c gtkcellrenderercombo.c \
-+ gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-+ gtkcellrendererspin.c gtkcellrenderertext.c \
-+ gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-+ gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-+ gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-+ gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-+ gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-+ gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-+ gtkfilechooserdefault.c gtkfilechooserdialog.c \
-+ gtkfilechooserembed.c gtkfilechooserentry.c \
-+ gtkfilechoosersettings.c gtkfilechooserutils.c \
-+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+ am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
+@@ -1517,18 +118,18 @@
+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
+- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
+- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
+- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
+- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
+- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
+- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
+- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
+- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
+- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
+- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
+- gtkprintcontext.c gtkprintoperation.c \
+ gtkhseparator.c gtkhsv.c gtkiconcache.c \
+ gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \
+ gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \
@@ -29872,32 +29917,34 @@
+ gtkmountoperation.c gtknotebook.c gtkobject.c gtkorientable.c \
+ gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
+ gtkplug.c gtkprintcontext.c gtkprintoperation.c \
-+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-+ gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
+@@ -1540,8 +141,8 @@
+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
+- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \
+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-+ gtktextbuffer.c gtktextbufferrichtext.c \
-+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+ gtktextbuffer.c gtktextbufferrichtext.c \
+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
+@@ -1555,27 +156,29 @@
+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
+- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
+- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
+- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
+- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
+- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
+- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
+- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
+- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \
+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \
@@ -29909,30 +29956,43 @@
+ gtkprinteroptionwidget.c gtkprintjob.c \
+ gtkprintoperation-unix.c gtkprintunixdialog.c \
+ gtkprintbackend.c gtksearchenginebeagle.c \
-+ gtksearchenginetracker.c gtkprint-win32.c \
-+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+ gtksearchenginetracker.c gtkprint-win32.c \
+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
+- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
+- gtkplug-stub.c gtksocket-stub.c
+- at USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \
+- at USE_QUARTZ_TRUE@ gtkquartz.lo
+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c
-+ at USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo
+ @USE_QUARTZ_FALSE at am__objects_1 = gtkclipboard.lo gtkdnd.lo
+-am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \
+- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \
+- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \
+ at USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo \
+ at USE_QUARTZ_TRUE@ gtkdnd-quartz.lo gtkquartz.lo
+am__objects_2 = gtkquery.lo gtksearchengine.lo \
+ gtksearchenginesimple.lo fnmatch.lo gtkaboutdialog.lo \
+ gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \
+ gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \
-+ gtkactivatable.lo gtkadjustment.lo gtkalignment.lo gtkarrow.lo \
-+ gtkaspectframe.lo gtkassistant.lo gtkbbox.lo gtkbin.lo \
-+ gtkbindings.lo gtkbox.lo gtkbuildable.lo gtkbuilder.lo \
-+ gtkbuilderparser.lo gtkbutton.lo gtkcalendar.lo \
-+ gtkcelleditable.lo gtkcelllayout.lo gtkcellrenderer.lo \
-+ gtkcellrendereraccel.lo gtkcellrenderercombo.lo \
-+ gtkcellrendererpixbuf.lo gtkcellrendererprogress.lo \
-+ gtkcellrendererspin.lo gtkcellrenderertext.lo \
-+ gtkcellrenderertoggle.lo gtkcellview.lo gtkcheckbutton.lo \
-+ gtkcheckmenuitem.lo gtkcolorbutton.lo gtkcolorsel.lo \
-+ gtkcolorseldialog.lo gtkcombobox.lo gtkcomboboxentry.lo \
-+ gtkcontainer.lo gtkcurve.lo gtkdialog.lo gtkdrawingarea.lo \
+ gtkactivatable.lo gtkadjustment.lo gtkalignment.lo gtkarrow.lo \
+ gtkaspectframe.lo gtkassistant.lo gtkbbox.lo gtkbin.lo \
+ gtkbindings.lo gtkbox.lo gtkbuildable.lo gtkbuilder.lo \
+@@ -1588,16 +191,17 @@
+ gtkcheckmenuitem.lo gtkcolorbutton.lo gtkcolorsel.lo \
+ gtkcolorseldialog.lo gtkcombobox.lo gtkcomboboxentry.lo \
+ gtkcontainer.lo gtkcurve.lo gtkdialog.lo gtkdrawingarea.lo \
+- gtkeditable.lo gtkentry.lo gtkentrycompletion.lo gtkeventbox.lo \
+- gtkexpander.lo gtkfilechooser.lo gtkfilechooserbutton.lo \
+- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \
+- gtkfilechooserembed.lo gtkfilechooserentry.lo \
+- gtkfilechoosersettings.lo gtkfilechooserutils.lo \
+- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \
+- gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \
+- gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \
+- gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \
+- gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \
+ gtkeditable.lo gtkentry.lo gtkentrycompletion.lo \
+ gtkeventbox.lo gtkexpander.lo gtkfilechooser.lo \
+ gtkfilechooserbutton.lo gtkfilechooserdefault.lo \
@@ -29944,24 +30004,21 @@
+ gtkgamma.lo gtkgc.lo gtkhandlebox.lo gtkhbbox.lo gtkhbox.lo \
+ gtkhpaned.lo gtkhruler.lo gtkhscale.lo gtkhscrollbar.lo \
+ gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \
-+ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \
-+ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \
-+ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \
-+ gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \
-+ gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \
-+ gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \
-+ gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \
-+ gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \
-+ gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \
-+ gtknotebook.lo gtkobject.lo gtkorientable.lo gtkpagesetup.lo \
-+ gtkpaned.lo gtkpapersize.lo gtkpathbar.lo gtkplug.lo \
-+ gtkprintcontext.lo gtkprintoperation.lo \
-+ gtkprintoperationpreview.lo gtkprintsettings.lo \
-+ gtkprintutils.lo gtkprogressbar.lo gtkradioaction.lo \
-+ gtkradiobutton.lo gtkradiomenuitem.lo gtkradiotoolbutton.lo \
-+ gtkrange.lo gtkrbtree.lo gtkrc.lo gtkrecentaction.lo \
-+ gtkrecentchooserdefault.lo gtkrecentchooserdialog.lo \
-+ gtkrecentchoosermenu.lo gtkrecentchooserwidget.lo \
+ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \
+ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \
+ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \
+@@ -1616,14 +220,15 @@
+ gtkrange.lo gtkrbtree.lo gtkrc.lo gtkrecentaction.lo \
+ gtkrecentchooserdefault.lo gtkrecentchooserdialog.lo \
+ gtkrecentchoosermenu.lo gtkrecentchooserwidget.lo \
+- gtkrecentchooserutils.lo gtkrecentchooser.lo gtkrecentfilter.lo \
+- gtkrecentmanager.lo gtkruler.lo gtkscale.lo gtkscalebutton.lo \
+- gtkscrollbar.lo gtkscrolledwindow.lo gtkselection.lo \
+- gtkseparator.lo gtkseparatormenuitem.lo gtkseparatortoolitem.lo \
+- gtksettings.lo gtksizegroup.lo gtkshow.lo gtksocket.lo \
+- gtkspinbutton.lo gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo \
+- gtkstyle.lo gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \
+- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \
+ gtkrecentchooserutils.lo gtkrecentchooser.lo \
+ gtkrecentfilter.lo gtkrecentmanager.lo gtkruler.lo gtkscale.lo \
+ gtkscalebutton.lo gtkscrollbar.lo gtkscrolledwindow.lo \
@@ -29971,76 +30028,47 @@
+ gtkstatusicon.lo gtkstock.lo gtkstyle.lo gtktable.lo \
+ gtktearoffmenuitem.lo gtktestutils.lo gtktextbtree.lo \
+ gtktextbuffer.lo gtktextbufferrichtext.lo \
-+ gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \
-+ gtktextiter.lo gtktextlayout.lo gtktextmark.lo \
-+ gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \
-+ gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \
-+ gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \
-+ gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \
-+ gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \
-+ gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \
-+ gtktreesortable.lo gtktreestore.lo gtktreeview.lo \
-+ gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \
-+ gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \
-+ gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \
-+ gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \
-+ gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \
-+ gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \
-+ gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \
-+ gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \
-+ gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo
-+am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \
-+ gtkprinteroption.lo gtkprinteroptionset.lo \
-+ gtkprinteroptionwidget.lo gtkprintjob.lo \
-+ gtkprintoperation-unix.lo gtkprintunixdialog.lo \
-+ gtkprintbackend.lo gtksearchenginebeagle.lo \
-+ gtksearchenginetracker.lo
-+ at OS_UNIX_TRUE@am__objects_4 = $(am__objects_3)
-+am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo
-+ at OS_WIN32_TRUE@am__objects_6 = $(am__objects_5)
-+am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \
-+ gtktrayicon-x11.lo
-+ at USE_X11_TRUE@am__objects_8 = $(am__objects_7)
-+am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \
-+ gtkwin32embedwidget.lo
-+ at USE_WIN32_TRUE@@USE_X11_FALSE at am__objects_10 = $(am__objects_9)
-+am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \
-+ gtksocket-stub.lo
+ gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \
+ gtktextiter.lo gtktextlayout.lo gtktextmark.lo \
+ gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \
+@@ -1659,16 +264,17 @@
+ @USE_WIN32_TRUE@@USE_X11_FALSE at am__objects_10 = $(am__objects_9)
+ am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \
+ gtksocket-stub.lo
+- at USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_12 = \
+- at USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11)
+ at USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_12 = $(am__objects_11)
-+am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo
+ am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo
+- at USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_14 = \
+- at USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13)
+ at USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_14 = $(am__objects_13)
-+am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
-+ $(am__objects_8) $(am__objects_10) $(am__objects_12) \
-+ $(am__objects_14)
-+am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15)
-+libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS)
+ am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
+ $(am__objects_8) $(am__objects_10) $(am__objects_12) \
+ $(am__objects_14)
+ am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15)
+ libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS)
+libgtk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libgtk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-+ gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-+ gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-+ gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-+ gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-+ gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-+ gtkcellrendereraccel.c gtkcellrenderercombo.c \
-+ gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-+ gtkcellrendererspin.c gtkcellrenderertext.c \
-+ gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-+ gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-+ gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-+ gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-+ gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-+ gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-+ gtkfilechooserdefault.c gtkfilechooserdialog.c \
-+ gtkfilechooserembed.c gtkfilechooserentry.c \
-+ gtkfilechoosersettings.c gtkfilechooserutils.c \
-+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+ am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
+@@ -1693,18 +299,18 @@
+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
+- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
+- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
+- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
+- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
+- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
+- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
+- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
+- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
+- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
+- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
+- gtkprintcontext.c gtkprintoperation.c \
+ gtkhseparator.c gtkhsv.c gtkiconcache.c \
+ gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \
+ gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \
@@ -30053,32 +30081,34 @@
+ gtkmountoperation.c gtknotebook.c gtkobject.c gtkorientable.c \
+ gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
+ gtkplug.c gtkprintcontext.c gtkprintoperation.c \
-+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-+ gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
+@@ -1716,8 +322,8 @@
+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
+- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \
+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-+ gtktextbuffer.c gtktextbufferrichtext.c \
-+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+ gtktextbuffer.c gtktextbufferrichtext.c \
+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
+@@ -1731,23 +337,27 @@
+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
+- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
+- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
+- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
+- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
+- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
+- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
+- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
+- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \
+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \
@@ -30090,40 +30120,38 @@
+ gtkprinteroptionwidget.c gtkprintjob.c \
+ gtkprintoperation-unix.c gtkprintunixdialog.c \
+ gtkprintbackend.c gtksearchenginebeagle.c \
-+ gtksearchenginetracker.c gtkprint-win32.c \
-+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+ gtksearchenginetracker.c gtkprint-win32.c \
+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
+- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
+- gtkplug-stub.c gtksocket-stub.c
+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c
-+am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15)
-+libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS)
+ am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15)
+ libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS)
+libgtk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libgtk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-+ gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-+ gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-+ gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-+ gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-+ gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-+ gtkcellrendereraccel.c gtkcellrenderercombo.c \
-+ gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-+ gtkcellrendererspin.c gtkcellrenderertext.c \
-+ gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-+ gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-+ gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-+ gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-+ gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-+ gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-+ gtkfilechooserdefault.c gtkfilechooserdialog.c \
-+ gtkfilechooserembed.c gtkfilechooserentry.c \
-+ gtkfilechoosersettings.c gtkfilechooserutils.c \
-+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+ am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
+@@ -1772,18 +382,18 @@
+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
+- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
+- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
+- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
+- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
+- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
+- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
+- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
+- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
+- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
+- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
+- gtkprintcontext.c gtkprintoperation.c \
+ gtkhseparator.c gtkhsv.c gtkiconcache.c \
+ gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \
+ gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \
@@ -30136,32 +30164,34 @@
+ gtkmountoperation.c gtknotebook.c gtkobject.c gtkorientable.c \
+ gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
+ gtkplug.c gtkprintcontext.c gtkprintoperation.c \
-+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-+ gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+ gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
+@@ -1795,8 +405,8 @@
+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \
+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
+- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
+- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \
+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-+ gtktextbuffer.c gtktextbufferrichtext.c \
-+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+ gtktextbuffer.c gtktextbufferrichtext.c \
+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
+@@ -1810,23 +420,27 @@
+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
+- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
+- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
+- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
+- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
+- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
+- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
+- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
+- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
+- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \
+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \
@@ -30173,40 +30203,38 @@
+ gtkprinteroptionwidget.c gtkprintjob.c \
+ gtkprintoperation-unix.c gtkprintunixdialog.c \
+ gtkprintbackend.c gtksearchenginebeagle.c \
-+ gtksearchenginetracker.c gtkprint-win32.c \
-+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+ gtksearchenginetracker.c gtkprint-win32.c \
+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
+- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
+- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
+- gtkplug-stub.c gtksocket-stub.c
+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c
-+am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15)
-+libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS)
+ am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15)
+ libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS)
+libgtk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libgtk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-+ gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-+ gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-+ gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-+ gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-+ gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-+ gtkcellrendereraccel.c gtkcellrenderercombo.c \
-+ gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-+ gtkcellrendererspin.c gtkcellrenderertext.c \
-+ gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-+ gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-+ gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-+ gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-+ gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-+ gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-+ gtkfilechooserdefault.c gtkfilechooserdialog.c \
-+ gtkfilechooserembed.c gtkfilechooserentry.c \
-+ gtkfilechoosersettings.c gtkfilechooserutils.c \
-+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+ am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
+@@ -1851,18 +465,591 @@
+ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
+ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
+ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
+- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
+- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
+- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
+- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
+- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
+- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
+- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
+- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
+- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
+- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
+- gtkprintcontext.c gtkprintoperation.c \
+ gtkhseparator.c gtkhsv.c gtkiconcache.c \
+ gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \
+ gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \
@@ -30551,7 +30579,7 @@
+top_srcdir = @top_srcdir@
+GTESTER = gtester # in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-
++
+# initialize variables for unconditional += appending
+EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) \
+ $(gtk_built_sources) $(STOCK_ICONS) $(STOCK_ICONS) \
@@ -30565,40 +30593,9 @@
+ pltcheck.sh gtktypebuiltins.c.template \
+ gtktypebuiltins.h.template
+TEST_PROGS =
-
--GENERATED_ICONS = \
-- stock-icons/16/gtk-go-back-rtl.png \
-- stock-icons/16/gtk-go-forward-rtl.png \
-- stock-icons/16/gtk-goto-first-rtl.png \
-- stock-icons/16/gtk-goto-last-rtl.png \
-- stock-icons/16/gtk-media-forward-rtl.png \
-- stock-icons/16/gtk-media-next-rtl.png \
-- stock-icons/16/gtk-media-previous-rtl.png \
-- stock-icons/16/gtk-media-rewind-rtl.png \
-- stock-icons/16/gtk-save.png \
-- stock-icons/16/drive-harddisk.png \
-- stock-icons/16/folder.png \
-- stock-icons/16/folder-remote.png \
-- stock-icons/16/user-home.png \
-- stock-icons/16/user-desktop.png \
-- stock-icons/16/text-x-generic.png \
-- stock-icons/24/gtk-go-back-rtl.png \
-- stock-icons/24/gtk-go-forward-rtl.png \
-- stock-icons/24/gtk-goto-first-rtl.png \
-- stock-icons/24/gtk-goto-last-rtl.png \
-- stock-icons/24/gtk-media-forward-rtl.png \
-- stock-icons/24/gtk-media-next-rtl.png \
-- stock-icons/24/gtk-media-previous-rtl.png \
-- stock-icons/24/gtk-media-rewind-rtl.png \
-- stock-icons/24/gtk-save.png \
-- stock-icons/24/drive-harddisk.png \
-- stock-icons/24/folder.png \
-- stock-icons/24/folder-remote.png \
-- stock-icons/24/user-home.png \
-- stock-icons/24/user-desktop.png \
-- stock-icons/24/text-x-generic.png
++
+### testing rules
-
++
+# Xvfb based test rules
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
@@ -30607,21 +30604,11 @@
+ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
+ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
+ 9995 9996 9997 9998 9999
-
-- at CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
-- at CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
-- at CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
-- at CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
++
+SKIP_GDKTARGET = \
+ test "$(gdktarget)" != "x11" \
+ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-
--subdir = gtk
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
--LTLIBRARIES = $(lib_LTLIBRARIES)
++
+XVFB_START = \
+ ${XVFB} -help 2>/dev/null 1>&2 \
+ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
@@ -30631,348 +30618,15 @@
+ && DISPLAY=:$$XID && export DISPLAY
+
+ at USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
-
--am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-- gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-- gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-- gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-- gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-- gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-- gtkcellrendereraccel.c gtkcellrenderercombo.c \
-- gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-- gtkcellrendererspin.c gtkcellrenderertext.c \
-- gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-- gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-- gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-- gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-- gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-- gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-- gtkfilechooserdefault.c gtkfilechooserdialog.c \
-- gtkfilechooserembed.c gtkfilechooserentry.c \
-- gtkfilechoosersettings.c gtkfilechooserutils.c \
-- gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-- gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-- gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-- gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
-- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
-- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
-- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
-- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
-- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
-- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
-- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
-- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
-- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
-- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
-- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
-- gtkprintcontext.c gtkprintoperation.c \
-- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-- gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-- gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
-- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
-- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-- gtktextbuffer.c gtktextbufferrichtext.c \
-- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
-- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
-- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
-- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
-- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
-- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
-- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
-- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
-- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
-- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
-- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
-- gtksearchenginetracker.c gtkprint-win32.c \
-- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
-- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
-- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
-- gtkplug-stub.c gtksocket-stub.c
-- at USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \
-- at USE_QUARTZ_TRUE@ gtkquartz.lo
-- at USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo
--am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \
-- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \
-- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \
-- gtkactivatable.lo gtkadjustment.lo gtkalignment.lo gtkarrow.lo \
-- gtkaspectframe.lo gtkassistant.lo gtkbbox.lo gtkbin.lo \
-- gtkbindings.lo gtkbox.lo gtkbuildable.lo gtkbuilder.lo \
-- gtkbuilderparser.lo gtkbutton.lo gtkcalendar.lo \
-- gtkcelleditable.lo gtkcelllayout.lo gtkcellrenderer.lo \
-- gtkcellrendereraccel.lo gtkcellrenderercombo.lo \
-- gtkcellrendererpixbuf.lo gtkcellrendererprogress.lo \
-- gtkcellrendererspin.lo gtkcellrenderertext.lo \
-- gtkcellrenderertoggle.lo gtkcellview.lo gtkcheckbutton.lo \
-- gtkcheckmenuitem.lo gtkcolorbutton.lo gtkcolorsel.lo \
-- gtkcolorseldialog.lo gtkcombobox.lo gtkcomboboxentry.lo \
-- gtkcontainer.lo gtkcurve.lo gtkdialog.lo gtkdrawingarea.lo \
-- gtkeditable.lo gtkentry.lo gtkentrycompletion.lo gtkeventbox.lo \
-- gtkexpander.lo gtkfilechooser.lo gtkfilechooserbutton.lo \
-- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \
-- gtkfilechooserembed.lo gtkfilechooserentry.lo \
-- gtkfilechoosersettings.lo gtkfilechooserutils.lo \
-- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \
-- gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \
-- gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \
-- gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \
-- gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \
-- gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \
-- gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \
-- gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \
-- gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \
-- gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \
-- gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \
-- gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \
-- gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \
-- gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \
-- gtknotebook.lo gtkobject.lo gtkorientable.lo gtkpagesetup.lo \
-- gtkpaned.lo gtkpapersize.lo gtkpathbar.lo gtkplug.lo \
-- gtkprintcontext.lo gtkprintoperation.lo \
-- gtkprintoperationpreview.lo gtkprintsettings.lo \
-- gtkprintutils.lo gtkprogressbar.lo gtkradioaction.lo \
-- gtkradiobutton.lo gtkradiomenuitem.lo gtkradiotoolbutton.lo \
-- gtkrange.lo gtkrbtree.lo gtkrc.lo gtkrecentaction.lo \
-- gtkrecentchooserdefault.lo gtkrecentchooserdialog.lo \
-- gtkrecentchoosermenu.lo gtkrecentchooserwidget.lo \
-- gtkrecentchooserutils.lo gtkrecentchooser.lo gtkrecentfilter.lo \
-- gtkrecentmanager.lo gtkruler.lo gtkscale.lo gtkscalebutton.lo \
-- gtkscrollbar.lo gtkscrolledwindow.lo gtkselection.lo \
-- gtkseparator.lo gtkseparatormenuitem.lo gtkseparatortoolitem.lo \
-- gtksettings.lo gtksizegroup.lo gtkshow.lo gtksocket.lo \
-- gtkspinbutton.lo gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo \
-- gtkstyle.lo gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \
-- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \
-- gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \
-- gtktextiter.lo gtktextlayout.lo gtktextmark.lo \
-- gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \
-- gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \
-- gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \
-- gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \
-- gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \
-- gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \
-- gtktreesortable.lo gtktreestore.lo gtktreeview.lo \
-- gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \
-- gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \
-- gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \
-- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \
-- gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \
-- gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \
-- gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \
-- gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \
-- gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo
--am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \
-- gtkprinteroption.lo gtkprinteroptionset.lo \
-- gtkprinteroptionwidget.lo gtkprintjob.lo \
-- gtkprintoperation-unix.lo gtkprintunixdialog.lo \
-- gtkprintbackend.lo gtksearchenginebeagle.lo \
-- gtksearchenginetracker.lo
-- at OS_UNIX_TRUE@am__objects_4 = $(am__objects_3)
--am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo
-- at OS_WIN32_TRUE@am__objects_6 = $(am__objects_5)
--am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \
-- gtktrayicon-x11.lo
-- at USE_X11_TRUE@am__objects_8 = $(am__objects_7)
--am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \
-- gtkwin32embedwidget.lo
-- at USE_WIN32_TRUE@@USE_X11_FALSE at am__objects_10 = $(am__objects_9)
--am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \
-- gtksocket-stub.lo
-- at USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_12 = \
-- at USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11)
--am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo
-- at USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__objects_14 = \
-- at USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13)
--am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
-- $(am__objects_8) $(am__objects_10) $(am__objects_12) \
-- $(am__objects_14)
--am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15)
--libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS)
--am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-- gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-- gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-- gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-- gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-- gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-- gtkcellrendereraccel.c gtkcellrenderercombo.c \
-- gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-- gtkcellrendererspin.c gtkcellrenderertext.c \
-- gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-- gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-- gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-- gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-- gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-- gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-- gtkfilechooserdefault.c gtkfilechooserdialog.c \
-- gtkfilechooserembed.c gtkfilechooserentry.c \
-- gtkfilechoosersettings.c gtkfilechooserutils.c \
-- gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-- gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-- gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-- gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
-- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
-- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
-- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
-- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
-- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
-- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
-- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
-- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
-- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
-- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
-- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
-- gtkprintcontext.c gtkprintoperation.c \
-- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-- gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-- gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
-- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
-- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-- gtktextbuffer.c gtktextbufferrichtext.c \
-- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
-- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
-- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
-- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
-- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
-- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
-- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
-- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
-- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
-- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
-- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
-- gtksearchenginetracker.c gtkprint-win32.c \
-- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
-- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
-- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
-- gtkplug-stub.c gtksocket-stub.c
--am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15)
--libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS)
--am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
-- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
-- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
-- gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-- gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
-- gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
-- gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
-- gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
-- gtkcellrendereraccel.c gtkcellrenderercombo.c \
-- gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
-- gtkcellrendererspin.c gtkcellrenderertext.c \
-- gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
-- gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
-- gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
-- gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
-- gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
-- gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
-- gtkfilechooserdefault.c gtkfilechooserdialog.c \
-- gtkfilechooserembed.c gtkfilechooserentry.c \
-- gtkfilechoosersettings.c gtkfilechooserutils.c \
-- gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
-- gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
-- gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
-- gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
-- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
-- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
-- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
-- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
-- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
-- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
-- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
-- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
-- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
-- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
-- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
-- gtkprintcontext.c gtkprintoperation.c \
-- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
-- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
-- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
-- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
-- gtkrecentchooserwidget.c gtkrecentchooserutils.c \
-- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
-- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \
-- gtkscrolledwindow.c gtkselection.c gtkseparator.c \
-- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
-- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
-- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \
-- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \
-- gtktextbuffer.c gtktextbufferrichtext.c \
-- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
-- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \
-- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \
-- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \
-- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \
-- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \
-- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \
-- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \
-- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \
-- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
-- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
-- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
-- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \
-- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \
-- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \
-- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \
-- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \
-- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \
-- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \
-- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \
-- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \
-- gtksearchenginetracker.c gtkprint-win32.c \
-- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \
-- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \
-- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \
-- gtkplug-stub.c gtksocket-stub.c
--am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15)
--libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS)
--am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
++
+# Makefile.am for gtk+/gtk
+ at USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f"
+SUBDIRS = theme-bits . tests
+DIST_SUBDIRS = theme-bits tests
-+ at HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr
-+ at HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups
++ at HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE at GTK_PRINT_BACKENDS = file,lpr
++ at HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE at GTK_PRINT_BACKENDS = file,papi
++ at HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE at GTK_PRINT_BACKENDS = file,cups
++ at HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"Gtk\" \
+ -DGTK_LIBDIR=\"$(libdir)\" \
@@ -31131,25 +30785,29 @@
+
+# GTK+ C sources to build the library from
+gtk_base_c_sources = gtkquery.c gtksearchengine.c \
- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
- gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-@@ -1845,18 +1036,18 @@
- gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
- gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
- gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
-- gtkhseparator.c gtkhsv.c gtkiconcache.c gtkiconcachevalidator.c \
-- gtkiconfactory.c gtkicontheme.c gtkiconview.c gtkimage.c \
-- gtkimagemenuitem.c gtkimcontext.c gtkimcontextsimple.c \
-- gtkimmodule.c gtkimmulticontext.c gtkinputdialog.c \
-- gtkinvisible.c gtkitem.c gtkkeyhash.c gtklabel.c gtklayout.c \
-- gtklinkbutton.c gtkliststore.c gtkmain.c gtkmarshal.c \
-- gtkmarshalers.c gtkmenu.c gtkmenubar.c gtkmenuitem.c \
-- gtkmenushell.c gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
-- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
-- gtknotebook.c gtkobject.c gtkorientable.c gtkpagesetup.c \
-- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \
-- gtkprintcontext.c gtkprintoperation.c \
++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
++ gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
++ gtkalignment.c gtkarrow.c gtkaspectframe.c gtkassistant.c \
++ gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c gtkbuildable.c \
++ gtkbuilder.c gtkbuilderparser.c gtkbutton.c gtkcalendar.c \
++ gtkcelleditable.c gtkcelllayout.c gtkcellrenderer.c \
++ gtkcellrendereraccel.c gtkcellrenderercombo.c \
++ gtkcellrendererpixbuf.c gtkcellrendererprogress.c \
++ gtkcellrendererspin.c gtkcellrenderertext.c \
++ gtkcellrenderertoggle.c gtkcellview.c gtkcheckbutton.c \
++ gtkcheckmenuitem.c gtkcolorbutton.c gtkcolorsel.c \
++ gtkcolorseldialog.c gtkcombobox.c gtkcomboboxentry.c \
++ gtkcontainer.c gtkcurve.c gtkdialog.c gtkdrawingarea.c \
++ gtkeditable.c gtkentry.c gtkentrycompletion.c gtkeventbox.c \
++ gtkexpander.c gtkfilechooser.c gtkfilechooserbutton.c \
++ gtkfilechooserdefault.c gtkfilechooserdialog.c \
++ gtkfilechooserembed.c gtkfilechooserentry.c \
++ gtkfilechoosersettings.c gtkfilechooserutils.c \
++ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesystem.c \
++ gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c gtkfontsel.c \
++ gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c \
++ gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c \
+ gtkhseparator.c gtkhsv.c gtkiconcache.c \
+ gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \
+ gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \
@@ -31165,7 +30823,7 @@
gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-@@ -1868,8 +1059,8 @@
+@@ -1874,8 +1061,8 @@
gtkscrolledwindow.c gtkselection.c gtkseparator.c \
gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
@@ -31176,7 +30834,7 @@
gtktextbuffer.c gtktextbufferrichtext.c \
gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-@@ -1884,372 +1075,501 @@
+@@ -1890,372 +1077,501 @@
gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
@@ -31894,8 +31552,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -31996,7 +31654,7 @@
else :; fi; \
done
-@@ -2257,8 +1577,8 @@
+@@ -2263,8 +1579,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -32007,7 +31665,7 @@
done
clean-binPROGRAMS:
-@@ -2269,20 +1589,19 @@
+@@ -2275,20 +1591,19 @@
done
gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES)
@rm -f gtk-query-immodules-2.0$(EXEEXT)
@@ -32033,7 +31691,7 @@
else :; fi; \
done
-@@ -2290,12 +1609,12 @@
+@@ -2296,12 +1611,12 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
@@ -32049,7 +31707,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -2563,82 +1882,64 @@
+@@ -2569,82 +1884,64 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/updateiconcache.Po at am__quote@
.c.o:
@@ -32158,7 +31816,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -2648,7 +1949,13 @@
+@@ -2654,7 +1951,13 @@
# (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):
@@ -32173,7 +31831,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2660,15 +1967,20 @@
+@@ -2666,15 +1969,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32198,7 +31856,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -2689,7 +2001,7 @@
+@@ -2695,7 +2003,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32207,7 +31865,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2700,35 +2012,30 @@
+@@ -2706,35 +2014,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -32226,7 +31884,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -32250,7 +31908,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -2736,23 +2043,23 @@
+@@ -2742,23 +2045,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -32283,19 +31941,16 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -2766,9 +2073,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
+@@ -2774,7 +2077,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -2777,25 +2084,25 @@
+@@ -2783,25 +2086,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -32303,7 +31958,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -32319,7 +31974,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -32331,11 +31986,46 @@
;; \
esac; \
else \
-@@ -2820,46 +2127,40 @@
+@@ -2809,63 +2112,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -32395,7 +32085,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -2872,13 +2173,17 @@
+@@ -2878,13 +2188,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -32417,7 +32107,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -2893,8 +2198,9 @@
+@@ -2899,8 +2213,9 @@
installdirs: installdirs-recursive
installdirs-am:
@@ -32429,7 +32119,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -2916,13 +2222,13 @@
+@@ -2922,13 +2237,13 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -32445,7 +32135,7 @@
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -2932,12 +2238,14 @@
+@@ -2938,12 +2253,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -32461,7 +32151,7 @@
info: info-recursive
info-am:
-@@ -2945,15 +2253,23 @@
+@@ -2951,15 +2268,23 @@
install-data-am: install-data-local install-gtkincludeHEADERS \
install-gtkunixprintincludeHEADERS
@@ -32485,7 +32175,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2976,35 +2292,34 @@
+@@ -2982,35 +2307,34 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-gtkincludeHEADERS \
@@ -32544,12 +32234,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gtk/tests/Makefile.in gtk+2.0-2.16.1/gtk/tests/Makefile.in
---- gtk+2.0-2.16.1.old/gtk/tests/Makefile.in 2009-04-11 21:55:31.000000000 +0200
-+++ gtk+2.0-2.16.1/gtk/tests/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gtk/tests/Makefile.in gtk+2.0-2.16.2/gtk/tests/Makefile.in
+--- gtk+2.0-2.16.2.old/gtk/tests/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gtk/tests/Makefile.in 2009-06-02 07:42:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -32726,7 +32416,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,91 +208,14 @@
+@@ -150,95 +208,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -32745,6 +32435,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -32819,7 +32513,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -258,24 +239,15 @@
+@@ -262,24 +239,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -32845,7 +32539,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -288,8 +260,6 @@
+@@ -292,8 +260,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -32854,7 +32548,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +271,10 @@
+@@ -305,28 +271,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -32883,7 +32577,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +283,25 @@
+@@ -335,22 +283,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -32913,7 +32607,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -370,6 +325,7 @@
+@@ -374,6 +325,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -32921,7 +32615,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,16 +334,20 @@
+@@ -382,16 +334,20 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -32945,7 +32639,7 @@
### testing rules
-@@ -412,7 +372,6 @@
+@@ -416,7 +372,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -32953,7 +32647,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -422,20 +381,16 @@
+@@ -426,20 +381,16 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -32974,7 +32668,7 @@
testing_SOURCES = testing.c
testing_LDADD = $(progs_ldadd)
liststore_SOURCES = liststore.c
-@@ -470,128 +425,39 @@
+@@ -474,128 +425,39 @@
defaultvalue_LDADD = $(progs_ldadd)
textbuffer_SOURCES = textbuffer.c pixbuf-init.c
textbuffer_LDADD = $(progs_ldadd)
@@ -33100,8 +32794,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -33130,7 +32824,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -601,37 +467,37 @@
+@@ -605,37 +467,37 @@
done
builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES)
@rm -f builder$(EXEEXT)
@@ -33179,7 +32873,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -649,37 +515,25 @@
+@@ -653,37 +515,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/treeview-scrolling.Po at am__quote@
.c.o:
@@ -33229,7 +32923,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -687,26 +541,15 @@
+@@ -691,26 +541,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -33252,14 +32946,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -716,23 +559,23 @@
+@@ -720,23 +559,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -33292,7 +32986,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -744,29 +587,23 @@
+@@ -748,29 +587,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -33335,7 +33029,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -781,7 +618,6 @@
+@@ -785,7 +618,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -33343,7 +33037,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -802,7 +638,7 @@
+@@ -806,7 +638,7 @@
clean-generic:
distclean-generic:
@@ -33352,7 +33046,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -816,24 +652,34 @@
+@@ -820,24 +652,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -33388,7 +33082,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -854,18 +700,23 @@
+@@ -858,18 +700,23 @@
ps-am:
@@ -33421,12 +33115,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.16.1/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.16.1.old/gtk/theme-bits/Makefile.in 2009-04-11 21:55:31.000000000 +0200
-+++ gtk+2.0-2.16.1/gtk/theme-bits/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.16.2/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.16.2.old/gtk/theme-bits/Makefile.in 2009-05-31 06:11:04.000000000 +0200
++++ gtk+2.0-2.16.2/gtk/theme-bits/Makefile.in 2009-06-02 07:42:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -33559,7 +33253,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +164,14 @@
+@@ -149,95 +164,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -33578,6 +33272,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -33652,7 +33350,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +195,15 @@
+@@ -261,24 +195,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -33678,7 +33376,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +216,6 @@
+@@ -291,8 +216,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -33687,7 +33385,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +227,10 @@
+@@ -304,28 +227,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -33716,7 +33414,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +239,25 @@
+@@ -334,22 +239,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -33746,7 +33444,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +281,7 @@
+@@ -373,6 +281,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -33754,7 +33452,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,14 +290,18 @@
+@@ -381,14 +290,18 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -33775,7 +33473,7 @@
TEST_PROGS =
### testing rules
-@@ -410,56 +327,46 @@
+@@ -414,56 +327,46 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -33829,8 +33527,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -33859,7 +33557,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -469,10 +376,10 @@
+@@ -473,10 +376,10 @@
done
decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES)
@rm -f decompose-bits$(EXEEXT)
@@ -33872,7 +33570,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -480,37 +387,25 @@
+@@ -484,37 +387,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decompose-bits.Po at am__quote@
.c.o:
@@ -33922,7 +33620,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -518,26 +413,15 @@
+@@ -522,26 +413,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -33945,14 +33643,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -547,23 +431,23 @@
+@@ -551,23 +431,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -33985,7 +33683,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -575,29 +459,23 @@
+@@ -579,29 +459,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -34028,7 +33726,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -612,7 +490,6 @@
+@@ -616,7 +490,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -34036,7 +33734,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -633,7 +510,7 @@
+@@ -637,7 +510,7 @@
clean-generic:
distclean-generic:
@@ -34045,7 +33743,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -647,24 +524,34 @@
+@@ -651,24 +524,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -34081,7 +33779,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -685,18 +572,23 @@
+@@ -689,18 +572,23 @@
ps-am:
@@ -34114,9 +33812,9 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/install-sh gtk+2.0-2.16.1/install-sh
---- gtk+2.0-2.16.1.old/install-sh 2009-02-24 04:53:12.000000000 +0100
-+++ gtk+2.0-2.16.1/install-sh 2009-04-12 11:21:17.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/install-sh gtk+2.0-2.16.2/install-sh
+--- gtk+2.0-2.16.2.old/install-sh 2009-02-24 04:53:12.000000000 +0100
++++ gtk+2.0-2.16.2/install-sh 2009-06-02 07:42:44.000000000 +0200
@@ -1,7 +1,8 @@
#!/bin/sh
-#
@@ -34822,9 +34520,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Naur gtk+2.0-2.16.1.old/ltmain.sh gtk+2.0-2.16.1/ltmain.sh
---- gtk+2.0-2.16.1.old/ltmain.sh 2009-02-25 21:39:39.000000000 +0100
-+++ gtk+2.0-2.16.1/ltmain.sh 2009-04-12 11:21:09.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/ltmain.sh gtk+2.0-2.16.2/ltmain.sh
+--- gtk+2.0-2.16.2.old/ltmain.sh 2009-02-25 21:39:39.000000000 +0100
++++ gtk+2.0-2.16.2/ltmain.sh 2009-06-02 07:42:34.000000000 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -34903,12 +34601,12 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.16.1.old/m4macros/Makefile.in gtk+2.0-2.16.1/m4macros/Makefile.in
---- gtk+2.0-2.16.1.old/m4macros/Makefile.in 2009-04-11 21:55:31.000000000 +0200
-+++ gtk+2.0-2.16.1/m4macros/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/m4macros/Makefile.in gtk+2.0-2.16.2/m4macros/Makefile.in
+--- gtk+2.0-2.16.2.old/m4macros/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/m4macros/Makefile.in 2009-06-02 07:42:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35031,7 +34729,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +154,14 @@
+@@ -149,95 +154,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -35050,6 +34748,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -35124,7 +34826,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +185,15 @@
+@@ -261,24 +185,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -35150,7 +34852,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +206,6 @@
+@@ -291,8 +206,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -35159,7 +34861,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +217,10 @@
+@@ -304,28 +217,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -35188,7 +34890,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +229,25 @@
+@@ -334,22 +229,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -35218,7 +34920,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +271,7 @@
+@@ -373,6 +271,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -35226,7 +34928,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +280,12 @@
+@@ -381,9 +280,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -35240,7 +34942,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,56 +316,63 @@
+@@ -414,56 +316,63 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -35267,8 +34969,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -35331,7 +35033,7 @@
done
tags: TAGS
TAGS:
-@@ -467,29 +380,23 @@
+@@ -471,29 +380,23 @@
ctags: CTAGS
CTAGS:
@@ -35374,7 +35076,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -504,9 +411,10 @@
+@@ -508,9 +411,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -35387,7 +35089,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -526,7 +434,7 @@
+@@ -530,7 +434,7 @@
clean-generic:
distclean-generic:
@@ -35396,7 +35098,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -537,24 +445,34 @@
+@@ -541,24 +445,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -35432,7 +35134,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -573,17 +491,22 @@
+@@ -577,17 +491,22 @@
ps-am:
@@ -35461,12 +35163,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/Makefile.in gtk+2.0-2.16.1/Makefile.in
---- gtk+2.0-2.16.1.old/Makefile.in 2009-04-11 23:33:06.000000000 +0200
-+++ gtk+2.0-2.16.1/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/Makefile.in gtk+2.0-2.16.2/Makefile.in
+--- gtk+2.0-2.16.2.old/Makefile.in 2009-05-31 06:11:01.000000000 +0200
++++ gtk+2.0-2.16.2/Makefile.in 2009-06-02 07:42:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35628,7 +35330,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,91 +193,14 @@
+@@ -150,95 +193,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -35647,6 +35349,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -35721,7 +35427,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -258,24 +224,15 @@
+@@ -262,24 +224,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -35747,7 +35453,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -288,8 +245,6 @@
+@@ -292,8 +245,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -35756,7 +35462,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +256,10 @@
+@@ -305,28 +256,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -35785,7 +35491,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +268,25 @@
+@@ -335,22 +268,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -35815,7 +35521,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -370,6 +310,7 @@
+@@ -374,6 +310,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -35823,7 +35529,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,125 +319,72 @@
+@@ -382,125 +319,72 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -36009,7 +35715,7 @@
TEST_PROGS =
### testing rules
-@@ -523,17 +411,17 @@
+@@ -527,17 +411,17 @@
&& DISPLAY=:$$XID && export DISPLAY
@@ -36032,7 +35738,7 @@
DISTCLEANFILES = \
gtk+-unix-print-2.0.pc \
gtk+-$(GDKTARGET)-2.0.pc \
-@@ -544,96 +432,83 @@
+@@ -548,96 +432,83 @@
gail-uninstalled.pc \
config.lt
@@ -36171,12 +35877,14 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-@@ -644,24 +519,22 @@
+@@ -647,25 +518,23 @@
+ -rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool
+- -rm -f libtool
-uninstall-info-am:
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++ -rm -f libtool config.lt
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
@@ -36203,7 +35911,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -671,7 +544,13 @@
+@@ -675,7 +544,13 @@
# (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):
@@ -36218,7 +35926,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -683,15 +562,20 @@
+@@ -687,15 +562,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36243,7 +35951,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -712,7 +596,7 @@
+@@ -716,7 +596,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36252,7 +35960,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -723,35 +607,30 @@
+@@ -727,35 +607,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -36271,7 +35979,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -36295,7 +36003,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -759,23 +638,23 @@
+@@ -763,23 +638,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -36328,7 +36036,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -787,40 +666,25 @@
+@@ -791,40 +666,25 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -36383,7 +36091,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -831,15 +695,19 @@
+@@ -835,15 +695,19 @@
|| exit 1; \
fi; \
done
@@ -36408,7 +36116,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -850,22 +718,55 @@
+@@ -854,22 +718,55 @@
-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 \
@@ -36469,7 +36177,7 @@
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
-@@ -885,19 +786,20 @@
+@@ -889,19 +786,20 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
@@ -36495,7 +36203,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -922,8 +824,9 @@
+@@ -926,8 +824,9 @@
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
@@ -36507,7 +36215,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -943,7 +846,7 @@
+@@ -947,7 +846,7 @@
clean-generic:
distclean-generic:
@@ -36516,7 +36224,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -956,13 +859,15 @@
+@@ -960,13 +859,15 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
@@ -36534,7 +36242,7 @@
info: info-recursive
info-am:
-@@ -971,12 +876,20 @@
+@@ -975,12 +876,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -36555,7 +36263,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -997,29 +910,28 @@
+@@ -1001,29 +910,28 @@
ps-am:
@@ -36605,9 +36313,9 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/missing gtk+2.0-2.16.1/missing
---- gtk+2.0-2.16.1.old/missing 2009-02-24 04:53:12.000000000 +0100
-+++ gtk+2.0-2.16.1/missing 2009-04-12 11:21:17.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/missing gtk+2.0-2.16.2/missing
+--- gtk+2.0-2.16.2.old/missing 2009-02-24 04:53:12.000000000 +0100
++++ gtk+2.0-2.16.2/missing 2009-06-02 07:42:44.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -37003,9 +36711,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Naur gtk+2.0-2.16.1.old/mkinstalldirs gtk+2.0-2.16.1/mkinstalldirs
---- gtk+2.0-2.16.1.old/mkinstalldirs 2009-02-24 04:53:12.000000000 +0100
-+++ gtk+2.0-2.16.1/mkinstalldirs 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/mkinstalldirs gtk+2.0-2.16.2/mkinstalldirs
+--- gtk+2.0-2.16.2.old/mkinstalldirs 2009-02-24 04:53:12.000000000 +0100
++++ gtk+2.0-2.16.2/mkinstalldirs 2009-06-02 07:42:53.000000000 +0200
@@ -1,21 +1,36 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -37166,12 +36874,12 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Naur gtk+2.0-2.16.1.old/modules/engines/Makefile.in gtk+2.0-2.16.1/modules/engines/Makefile.in
---- gtk+2.0-2.16.1.old/modules/engines/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/engines/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/engines/Makefile.in gtk+2.0-2.16.2/modules/engines/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/engines/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/engines/Makefile.in 2009-06-02 07:42:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37298,7 +37006,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +156,14 @@
+@@ -149,95 +156,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -37317,6 +37025,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -37391,7 +37103,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +187,15 @@
+@@ -261,24 +187,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -37417,7 +37129,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +208,6 @@
+@@ -291,8 +208,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -37426,7 +37138,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +219,10 @@
+@@ -304,28 +219,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -37455,7 +37167,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +231,25 @@
+@@ -334,22 +231,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -37485,7 +37197,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +273,7 @@
+@@ -373,6 +273,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -37493,7 +37205,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +282,12 @@
+@@ -381,9 +282,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -37507,7 +37219,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,33 +318,40 @@
+@@ -414,33 +318,40 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -37538,8 +37250,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -37568,7 +37280,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -444,10 +359,6 @@
+@@ -448,10 +359,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -37579,7 +37291,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -455,7 +366,13 @@
+@@ -459,7 +366,13 @@
# (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):
@@ -37594,7 +37306,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -467,15 +384,20 @@
+@@ -471,15 +384,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37619,7 +37331,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -496,7 +418,7 @@
+@@ -500,7 +418,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37628,7 +37340,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -507,35 +429,30 @@
+@@ -511,35 +429,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -37647,7 +37359,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -37671,7 +37383,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -543,23 +460,23 @@
+@@ -547,23 +460,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -37704,7 +37416,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -571,29 +488,23 @@
+@@ -575,29 +488,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -37747,7 +37459,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -606,13 +517,17 @@
+@@ -610,13 +517,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -37769,7 +37481,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -623,7 +538,6 @@
+@@ -627,7 +538,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -37777,7 +37489,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -643,7 +557,7 @@
+@@ -647,7 +557,7 @@
clean-generic:
distclean-generic:
@@ -37786,7 +37498,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -654,25 +568,34 @@
+@@ -658,25 +568,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -37823,7 +37535,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -691,26 +614,24 @@
+@@ -695,26 +614,24 @@
ps-am:
@@ -37866,12 +37578,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.16.1/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.16.1.old/modules/engines/ms-windows/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/engines/ms-windows/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.16.2/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/engines/ms-windows/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/engines/ms-windows/Makefile.in 2009-06-02 07:42:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -38029,7 +37741,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +189,14 @@
+@@ -149,95 +189,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -38048,6 +37760,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -38122,7 +37838,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +220,15 @@
+@@ -261,24 +220,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -38148,7 +37864,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +241,6 @@
+@@ -291,8 +241,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -38157,7 +37873,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +252,10 @@
+@@ -304,28 +252,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -38186,7 +37902,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +264,25 @@
+@@ -334,22 +264,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -38216,7 +37932,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +306,7 @@
+@@ -373,6 +306,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -38224,7 +37940,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +315,12 @@
+@@ -381,9 +315,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -38238,7 +37954,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +351,7 @@
+@@ -414,9 +351,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -38248,7 +37964,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -420,18 +359,14 @@
+@@ -424,18 +359,14 @@
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEP_CFLAGS)
@@ -38267,7 +37983,7 @@
libwimp_la_SOURCES = \
msw_rc_style.c \
msw_rc_style.h \
-@@ -442,95 +377,75 @@
+@@ -446,95 +377,75 @@
xp_theme_defs.h \
xp_theme.h
@@ -38327,8 +38043,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -38400,7 +38116,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -541,37 +456,25 @@
+@@ -545,37 +456,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xp_theme.Plo at am__quote@
.c.o:
@@ -38450,7 +38166,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -579,10 +482,6 @@
+@@ -583,10 +482,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -38461,7 +38177,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -590,7 +489,13 @@
+@@ -594,7 +489,13 @@
# (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):
@@ -38476,7 +38192,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -602,15 +507,20 @@
+@@ -606,15 +507,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38501,7 +38217,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -631,7 +541,7 @@
+@@ -635,7 +541,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38510,7 +38226,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -642,35 +552,30 @@
+@@ -646,35 +552,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -38529,7 +38245,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -38553,7 +38269,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -678,23 +583,23 @@
+@@ -682,23 +583,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -38586,7 +38302,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -706,29 +611,23 @@
+@@ -710,29 +611,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -38629,7 +38345,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -739,15 +638,19 @@
+@@ -743,15 +638,19 @@
|| exit 1; \
fi; \
done
@@ -38654,7 +38370,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -758,8 +661,9 @@
+@@ -762,8 +661,9 @@
all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
@@ -38666,7 +38382,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -779,7 +683,7 @@
+@@ -783,7 +683,7 @@
clean-generic:
distclean-generic:
@@ -38675,7 +38391,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -793,24 +697,34 @@
+@@ -797,24 +697,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -38711,7 +38427,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -831,28 +745,27 @@
+@@ -835,28 +745,27 @@
ps-am:
@@ -38758,12 +38474,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.16.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.16.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.16.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -38886,7 +38602,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +154,14 @@
+@@ -149,95 +154,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -38905,6 +38621,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -38979,7 +38699,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +185,15 @@
+@@ -261,24 +185,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -39005,7 +38725,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +206,6 @@
+@@ -291,8 +206,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -39014,7 +38734,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +217,10 @@
+@@ -304,28 +217,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -39043,7 +38763,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +229,25 @@
+@@ -334,22 +229,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -39073,7 +38793,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +271,7 @@
+@@ -373,6 +271,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -39081,7 +38801,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +280,12 @@
+@@ -381,9 +280,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -39095,7 +38815,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,54 +316,62 @@
+@@ -414,54 +316,62 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -39120,8 +38840,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -39184,7 +38904,7 @@
done
tags: TAGS
TAGS:
-@@ -465,29 +379,23 @@
+@@ -469,29 +379,23 @@
ctags: CTAGS
CTAGS:
@@ -39227,7 +38947,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -502,9 +410,10 @@
+@@ -506,9 +410,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -39240,7 +38960,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -524,7 +433,7 @@
+@@ -528,7 +433,7 @@
clean-generic:
distclean-generic:
@@ -39249,7 +38969,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -535,24 +444,34 @@
+@@ -539,24 +444,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -39285,7 +39005,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -571,17 +490,21 @@
+@@ -575,17 +490,21 @@
ps-am:
@@ -39315,12 +39035,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.16.1/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.16.1.old/modules/engines/ms-windows/Theme/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/engines/ms-windows/Theme/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.16.2/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/engines/ms-windows/Theme/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/engines/ms-windows/Theme/Makefile.in 2009-06-02 07:42:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -39447,7 +39167,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +156,14 @@
+@@ -149,95 +156,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -39466,6 +39186,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -39540,7 +39264,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +187,15 @@
+@@ -261,24 +187,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -39566,7 +39290,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +208,6 @@
+@@ -291,8 +208,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -39575,7 +39299,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +219,10 @@
+@@ -304,28 +219,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -39604,7 +39328,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +231,25 @@
+@@ -334,22 +231,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -39634,7 +39358,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +273,7 @@
+@@ -373,6 +273,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -39642,7 +39366,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +282,12 @@
+@@ -381,9 +282,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -39656,7 +39380,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,31 +318,39 @@
+@@ -414,31 +318,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -39685,8 +39409,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -39715,7 +39439,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +358,6 @@
+@@ -446,10 +358,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -39726,7 +39450,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -453,7 +365,13 @@
+@@ -457,7 +365,13 @@
# (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):
@@ -39741,7 +39465,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +383,20 @@
+@@ -469,15 +383,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39766,7 +39490,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +417,7 @@
+@@ -498,7 +417,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -39775,7 +39499,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +428,30 @@
+@@ -509,35 +428,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -39794,7 +39518,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -39818,7 +39542,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +459,23 @@
+@@ -545,23 +459,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -39851,7 +39575,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +487,23 @@
+@@ -573,29 +487,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -39894,7 +39618,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +514,19 @@
+@@ -606,15 +514,19 @@
|| exit 1; \
fi; \
done
@@ -39919,7 +39643,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +537,6 @@
+@@ -625,7 +537,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -39927,7 +39651,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +556,7 @@
+@@ -645,7 +556,7 @@
clean-generic:
distclean-generic:
@@ -39936,7 +39660,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +567,34 @@
+@@ -656,25 +567,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -39973,7 +39697,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +613,24 @@
+@@ -693,26 +613,24 @@
ps-am:
@@ -40016,12 +39740,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.16.1/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.16.1.old/modules/engines/pixbuf/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/engines/pixbuf/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.16.2/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/engines/pixbuf/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/engines/pixbuf/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -40170,7 +39894,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +180,14 @@
+@@ -149,95 +180,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -40189,6 +39913,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -40263,7 +39991,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +211,15 @@
+@@ -261,24 +211,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -40289,7 +40017,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +232,6 @@
+@@ -291,8 +232,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -40298,7 +40026,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +243,10 @@
+@@ -304,28 +243,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -40327,7 +40055,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +255,25 @@
+@@ -334,22 +255,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -40357,7 +40085,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +297,7 @@
+@@ -373,6 +297,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -40365,7 +40093,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +306,12 @@
+@@ -381,9 +306,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -40379,7 +40107,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +342,7 @@
+@@ -414,9 +342,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -40389,7 +40117,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -420,18 +350,14 @@
+@@ -424,18 +350,14 @@
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEP_CFLAGS)
@@ -40408,7 +40136,7 @@
libpixmap_la_SOURCES = \
pixbuf-draw.c \
pixbuf-main.c \
-@@ -441,85 +367,73 @@
+@@ -445,85 +367,73 @@
pixbuf-style.h \
pixbuf.h
@@ -40458,8 +40186,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -40531,7 +40259,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -530,37 +444,25 @@
+@@ -534,37 +444,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pixbuf-render.Plo at am__quote@
.c.o:
@@ -40581,7 +40309,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -568,26 +470,15 @@
+@@ -572,26 +470,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -40604,14 +40332,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -597,23 +488,23 @@
+@@ -601,23 +488,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -40644,7 +40372,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -625,29 +516,23 @@
+@@ -629,29 +516,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -40687,7 +40415,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -662,9 +547,10 @@
+@@ -666,9 +547,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES)
@@ -40700,7 +40428,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -684,7 +570,7 @@
+@@ -688,7 +570,7 @@
clean-generic:
distclean-generic:
@@ -40709,7 +40437,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -698,24 +584,34 @@
+@@ -702,24 +584,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -40745,7 +40473,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -736,20 +632,24 @@
+@@ -740,20 +632,24 @@
ps-am:
@@ -40780,12 +40508,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/input/Makefile.in gtk+2.0-2.16.1/modules/input/Makefile.in
---- gtk+2.0-2.16.1.old/modules/input/Makefile.in 2009-04-11 21:55:33.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/input/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/input/Makefile.in gtk+2.0-2.16.2/modules/input/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/input/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/input/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41133,7 +40861,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +379,14 @@
+@@ -149,95 +379,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -41152,6 +40880,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -41226,7 +40958,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +410,15 @@
+@@ -261,24 +410,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -41252,7 +40984,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +431,6 @@
+@@ -291,8 +431,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -41261,7 +40993,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +442,10 @@
+@@ -304,28 +442,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -41290,7 +41022,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +454,25 @@
+@@ -334,22 +454,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -41320,7 +41052,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +496,7 @@
+@@ -373,6 +496,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -41328,7 +41060,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +505,12 @@
+@@ -381,9 +505,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -41342,7 +41074,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +541,7 @@
+@@ -414,9 +541,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -41352,7 +41084,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -424,22 +553,18 @@
+@@ -428,22 +553,18 @@
$(GTK_DEP_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE)
@@ -41375,7 +41107,7 @@
im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_xim_la_SOURCES = \
gtkimcontextxim.c \
-@@ -450,42 +575,36 @@
+@@ -454,42 +575,36 @@
im_xim_la_LIBADD = $(LDADDS)
@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE at STATIC_XIM_MODULE = libstatic-im-xim.la
@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE at XIM_MODULE = im-xim.la
@@ -41418,7 +41150,7 @@
im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_thai_la_SOURCES = \
thai-charprop.c \
-@@ -498,28 +617,24 @@
+@@ -502,28 +617,24 @@
im_thai_la_LIBADD = $(LDADDS)
@INCLUDE_IM_THAI_TRUE at STATIC_THAI_MODULE = libstatic-im-thai.la
@INCLUDE_IM_THAI_FALSE at THAI_MODULE = im-thai.la
@@ -41447,7 +41179,7 @@
im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_ime_la_SOURCES = \
gtkimcontextime.c \
-@@ -532,7 +647,6 @@
+@@ -536,7 +647,6 @@
libstatic_im_ime_la_LIBADD = -limm32
@INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE at STATIC_IME_MODULE = libstatic-im-ime.la
@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE at IME_MODULE = im-ime.la
@@ -41455,7 +41187,7 @@
multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
im_multipress_la_CPPFLAGS = $(multipress_defs)
libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
-@@ -546,13 +660,11 @@
+@@ -550,13 +660,11 @@
im_multipress_la_LIBADD = $(LDADDS)
@INCLUDE_IM_MULTIPRESS_TRUE at STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la
@INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
@@ -41471,7 +41203,7 @@
@BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
@BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \
-@@ -567,7 +679,6 @@
+@@ -571,7 +679,6 @@
@BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \
@BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE)
@@ -41479,7 +41211,7 @@
noinst_LTLIBRARIES = \
$(STATIC_AM_ET_MODULE) \
$(STATIC_CEDILLA_MODULE) \
-@@ -582,234 +693,64 @@
+@@ -586,234 +693,64 @@
$(STATIC_VIQR_MODULE) \
$(STATIC_XIM_MODULE)
@@ -41686,8 +41418,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -41749,7 +41481,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -818,61 +759,61 @@
+@@ -822,61 +759,61 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -41837,7 +41569,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -898,214 +839,86 @@
+@@ -902,214 +839,86 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thai-charprop.Plo at am__quote@
.c.o:
@@ -42083,14 +41815,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1115,23 +928,23 @@
+@@ -1119,23 +928,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -42123,7 +41855,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1143,29 +956,23 @@
+@@ -1147,29 +956,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42166,7 +41898,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1179,10 +986,12 @@
+@@ -1183,10 +986,12 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
@@ -42181,7 +41913,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -1203,7 +1012,7 @@
+@@ -1207,7 +1012,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -42190,7 +41922,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1217,12 +1026,14 @@
+@@ -1221,12 +1026,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -42206,7 +41938,7 @@
info: info-am
info-am:
-@@ -1231,12 +1042,20 @@
+@@ -1235,12 +1042,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -42227,7 +41959,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1257,22 +1076,27 @@
+@@ -1261,22 +1076,27 @@
ps-am:
@@ -42262,7 +41994,7 @@
# call as: $(XVFB_START) && someprogram
-@@ -1355,7 +1179,18 @@
+@@ -1359,7 +1179,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -42282,12 +42014,12 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Naur gtk+2.0-2.16.1.old/modules/Makefile.in gtk+2.0-2.16.1/modules/Makefile.in
---- gtk+2.0-2.16.1.old/modules/Makefile.in 2009-04-11 21:55:32.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/Makefile.in 2009-04-12 11:21:21.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/Makefile.in gtk+2.0-2.16.2/modules/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/Makefile.in 2009-06-02 07:42:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42415,7 +42147,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,91 +157,14 @@
+@@ -150,95 +157,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -42434,6 +42166,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -42508,7 +42244,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -258,24 +188,15 @@
+@@ -262,24 +188,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -42534,7 +42270,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -288,8 +209,6 @@
+@@ -292,8 +209,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -42543,7 +42279,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +220,10 @@
+@@ -305,28 +220,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -42572,7 +42308,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +232,25 @@
+@@ -335,22 +232,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -42602,7 +42338,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -370,6 +274,7 @@
+@@ -374,6 +274,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -42610,7 +42346,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,9 +283,12 @@
+@@ -382,9 +283,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -42624,7 +42360,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -411,31 +319,39 @@
+@@ -415,31 +319,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -42653,8 +42389,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -42683,7 +42419,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -443,10 +359,6 @@
+@@ -447,10 +359,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -42694,7 +42430,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -454,7 +366,13 @@
+@@ -458,7 +366,13 @@
# (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):
@@ -42709,7 +42445,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -466,15 +384,20 @@
+@@ -470,15 +384,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42734,7 +42470,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -495,7 +418,7 @@
+@@ -499,7 +418,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42743,7 +42479,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -506,35 +429,30 @@
+@@ -510,35 +429,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -42762,7 +42498,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -42786,7 +42522,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -542,23 +460,23 @@
+@@ -546,23 +460,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -42819,7 +42555,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -570,29 +488,23 @@
+@@ -574,29 +488,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42862,7 +42598,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -605,13 +517,17 @@
+@@ -609,13 +517,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -42884,7 +42620,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -622,7 +538,6 @@
+@@ -626,7 +538,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -42892,7 +42628,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -642,7 +557,7 @@
+@@ -646,7 +557,7 @@
clean-generic:
distclean-generic:
@@ -42901,7 +42637,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -653,25 +568,34 @@
+@@ -657,25 +568,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -42938,7 +42674,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -690,26 +614,24 @@
+@@ -694,26 +614,24 @@
ps-am:
@@ -42981,12 +42717,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.16.1/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.16.1.old/modules/other/gail/libgail-util/Makefile.in 2009-04-11 21:55:33.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/other/gail/libgail-util/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.16.2/modules/other/gail/libgail-util/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/other/gail/libgail-util/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/other/gail/libgail-util/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -43139,7 +42875,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +184,14 @@
+@@ -149,95 +184,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -43158,6 +42894,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -43232,7 +42972,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +215,15 @@
+@@ -261,24 +215,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -43258,7 +42998,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +236,6 @@
+@@ -291,8 +236,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -43267,7 +43007,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +247,10 @@
+@@ -304,28 +247,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -43296,7 +43036,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +259,25 @@
+@@ -334,22 +259,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -43326,7 +43066,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +301,7 @@
+@@ -373,6 +301,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -43334,7 +43074,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +310,12 @@
+@@ -381,9 +310,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -43348,7 +43088,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -412,32 +348,24 @@
+@@ -416,32 +348,24 @@
@PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
@OS_WIN32_TRUE at export_symbols = -export-symbols $(srcdir)/gailutil.def
@@ -43381,7 +43121,7 @@
libgailutil_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -448,102 +376,87 @@
+@@ -452,102 +376,87 @@
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
@@ -43448,8 +43188,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -43521,7 +43261,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -552,148 +465,72 @@
+@@ -556,148 +465,72 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgailutil_la-gailtextutil.Plo at am__quote@
.c.o:
@@ -43693,14 +43433,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -703,23 +540,23 @@
+@@ -707,23 +540,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -43733,7 +43473,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -731,29 +568,23 @@
+@@ -735,29 +568,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -43776,7 +43516,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -768,9 +599,10 @@
+@@ -772,9 +599,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
@@ -43789,7 +43529,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -790,7 +622,7 @@
+@@ -794,7 +622,7 @@
clean-generic:
distclean-generic:
@@ -43798,7 +43538,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -804,24 +636,34 @@
+@@ -808,24 +636,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -43834,7 +43574,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -842,21 +684,25 @@
+@@ -846,21 +684,25 @@
ps-am:
@@ -43871,12 +43611,12 @@
uninstall-libgailutilincludeHEADERS uninstall-local
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/other/gail/Makefile.in gtk+2.0-2.16.1/modules/other/gail/Makefile.in
---- gtk+2.0-2.16.1.old/modules/other/gail/Makefile.in 2009-04-11 21:55:33.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/other/gail/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/other/gail/Makefile.in gtk+2.0-2.16.2/modules/other/gail/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/other/gail/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/other/gail/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -44069,7 +43809,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +224,14 @@
+@@ -149,95 +224,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -44088,6 +43828,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -44162,7 +43906,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +255,15 @@
+@@ -261,24 +255,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -44188,7 +43932,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +276,6 @@
+@@ -291,8 +276,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -44197,7 +43941,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +287,10 @@
+@@ -304,28 +287,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -44226,7 +43970,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +299,25 @@
+@@ -334,22 +299,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -44256,7 +44000,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +341,7 @@
+@@ -373,6 +341,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -44264,7 +44008,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +350,12 @@
+@@ -381,9 +350,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -44278,7 +44022,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,14 +386,10 @@
+@@ -414,14 +386,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -44293,7 +44037,7 @@
gail_c_sources = \
gail-private-macros.h \
gail.c \
-@@ -477,9 +449,7 @@
+@@ -481,9 +449,7 @@
gailwidget.c \
gailwindow.c
@@ -44303,7 +44047,7 @@
gail_private_h_sources = \
gail.h \
gailadjustment.h \
-@@ -538,21 +508,17 @@
+@@ -542,21 +508,17 @@
gailutil.h \
gailwindow.h
@@ -44325,7 +44069,7 @@
libgail_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/modules/other \
-@@ -565,13 +531,11 @@
+@@ -569,13 +531,11 @@
-DGTK_DISABLE_DEPRECATED \
$(AM_CPPFLAGS)
@@ -44339,7 +44083,7 @@
libgail_la_LIBADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
-@@ -580,180 +544,76 @@
+@@ -584,180 +544,76 @@
$(GTK_DEP_LIBS) \
$(INTLLIBS)
@@ -44484,8 +44228,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -44557,7 +44301,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -816,1912 +676,439 @@
+@@ -820,1912 +676,439 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgail_la-gailwindow.Plo at am__quote@
.c.o:
@@ -46713,7 +46457,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -2731,7 +1118,13 @@
+@@ -2735,7 +1118,13 @@
# (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):
@@ -46728,7 +46472,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2743,15 +1136,20 @@
+@@ -2747,15 +1136,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46753,7 +46497,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -2772,7 +1170,7 @@
+@@ -2776,7 +1170,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46762,7 +46506,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2783,35 +1181,30 @@
+@@ -2787,35 +1181,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -46781,7 +46525,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -46805,7 +46549,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -2819,23 +1212,23 @@
+@@ -2823,23 +1212,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -46838,7 +46582,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -2847,29 +1240,23 @@
+@@ -2851,29 +1240,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46881,7 +46625,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -2880,15 +1267,19 @@
+@@ -2884,15 +1267,19 @@
|| exit 1; \
fi; \
done
@@ -46906,7 +46650,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -2899,8 +1290,9 @@
+@@ -2903,8 +1290,9 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -46918,7 +46662,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -2920,7 +1312,7 @@
+@@ -2924,7 +1312,7 @@
clean-generic:
distclean-generic:
@@ -46927,7 +46671,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -2934,24 +1326,35 @@
+@@ -2938,24 +1326,35 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -46965,7 +46709,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2972,30 +1375,28 @@
+@@ -2976,30 +1375,28 @@
ps-am:
@@ -47015,12 +46759,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.16.1/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.16.1.old/modules/other/gail/tests/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/other/gail/tests/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.16.2/modules/other/gail/tests/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/other/gail/tests/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/other/gail/tests/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47294,7 +47038,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +305,14 @@
+@@ -149,95 +305,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -47313,6 +47057,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -47387,7 +47135,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +336,15 @@
+@@ -261,24 +336,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -47413,7 +47161,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +357,6 @@
+@@ -291,8 +357,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -47422,7 +47170,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +368,10 @@
+@@ -304,28 +368,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -47451,7 +47199,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +380,25 @@
+@@ -334,22 +380,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -47481,7 +47229,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +422,7 @@
+@@ -373,6 +422,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -47489,7 +47237,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +431,12 @@
+@@ -381,9 +431,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -47503,7 +47251,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,15 +467,11 @@
+@@ -414,15 +467,11 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -47519,7 +47267,7 @@
noinst_LTLIBRARIES = \
libtestaction.la \
libtestbutton.la \
-@@ -439,7 +492,6 @@
+@@ -443,7 +492,6 @@
libtesttreetable.la \
libtestvalues.la
@@ -47527,7 +47275,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -449,34 +501,28 @@
+@@ -453,34 +501,28 @@
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
@@ -47562,7 +47310,7 @@
libtestaction_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -484,13 +530,11 @@
+@@ -488,13 +530,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47576,7 +47324,7 @@
libtestbutton_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -498,13 +542,11 @@
+@@ -502,13 +542,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47590,7 +47338,7 @@
libtestcombo_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -512,11 +554,9 @@
+@@ -516,11 +554,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47602,7 +47350,7 @@
libtestcomponent_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -524,11 +564,9 @@
+@@ -528,11 +564,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47614,7 +47362,7 @@
libtestimage_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -536,13 +574,11 @@
+@@ -540,13 +574,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47628,7 +47376,7 @@
libtestmenuitem_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -550,13 +586,11 @@
+@@ -554,13 +586,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47642,7 +47390,7 @@
libtestnotebook_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -564,13 +598,11 @@
+@@ -568,13 +598,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47656,7 +47404,7 @@
libtestobject_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -578,13 +610,11 @@
+@@ -582,13 +610,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47670,7 +47418,7 @@
libtestoptionmenu_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -592,13 +622,11 @@
+@@ -596,13 +622,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47684,7 +47432,7 @@
libtestpaned_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -606,13 +634,11 @@
+@@ -610,13 +634,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47698,7 +47446,7 @@
libtestprops_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -620,11 +646,9 @@
+@@ -624,11 +646,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47710,7 +47458,7 @@
libtestselection_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -632,11 +656,9 @@
+@@ -636,11 +656,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47722,7 +47470,7 @@
libteststatusbar_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -644,7 +666,6 @@
+@@ -648,7 +666,6 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47730,7 +47478,7 @@
libtesttable_la_SOURCES = \
testlib.c \
testlib.h \
-@@ -652,7 +673,6 @@
+@@ -656,7 +673,6 @@
testtextlib.h \
testtable.c
@@ -47738,7 +47486,7 @@
libtesttable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -660,7 +680,6 @@
+@@ -664,7 +680,6 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47746,7 +47494,7 @@
libtesttext_la_SOURCES = \
testlib.c \
testlib.h \
-@@ -668,7 +687,6 @@
+@@ -672,7 +687,6 @@
testtextlib.h \
testtext.c
@@ -47754,7 +47502,7 @@
libtesttext_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -676,13 +694,11 @@
+@@ -680,13 +694,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47768,7 +47516,7 @@
libtesttoplevel_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -690,13 +706,11 @@
+@@ -694,13 +706,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47782,7 +47530,7 @@
libtesttreetable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -704,11 +718,9 @@
+@@ -708,11 +718,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47794,7 +47542,7 @@
libtestvalues_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -716,150 +728,63 @@
+@@ -720,150 +728,63 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -47917,8 +47665,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -47980,7 +47728,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -868,51 +793,51 @@
+@@ -872,51 +793,51 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -48053,7 +47801,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -940,37 +865,25 @@
+@@ -944,37 +865,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testvalues.Plo at am__quote@
.c.o:
@@ -48103,7 +47851,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -978,26 +891,15 @@
+@@ -982,26 +891,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -48126,14 +47874,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1007,23 +909,23 @@
+@@ -1011,23 +909,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -48166,7 +47914,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1035,29 +937,23 @@
+@@ -1039,29 +937,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48209,7 +47957,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1072,9 +968,10 @@
+@@ -1076,9 +968,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES)
@@ -48222,7 +47970,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -1094,7 +991,7 @@
+@@ -1098,7 +991,7 @@
clean-generic:
distclean-generic:
@@ -48231,7 +47979,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1108,24 +1005,34 @@
+@@ -1112,24 +1005,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -48267,7 +48015,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1146,20 +1053,24 @@
+@@ -1150,20 +1053,24 @@
ps-am:
@@ -48301,12 +48049,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/other/Makefile.in gtk+2.0-2.16.1/modules/other/Makefile.in
---- gtk+2.0-2.16.1.old/modules/other/Makefile.in 2009-04-11 21:55:33.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/other/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/other/Makefile.in gtk+2.0-2.16.2/modules/other/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/other/Makefile.in 2009-05-31 06:11:05.000000000 +0200
++++ gtk+2.0-2.16.2/modules/other/Makefile.in 2009-06-02 07:42:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -48433,7 +48181,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +156,14 @@
+@@ -149,95 +156,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -48452,6 +48200,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -48526,7 +48278,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +187,15 @@
+@@ -261,24 +187,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -48552,7 +48304,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +208,6 @@
+@@ -291,8 +208,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -48561,7 +48313,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +219,10 @@
+@@ -304,28 +219,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -48590,7 +48342,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +231,25 @@
+@@ -334,22 +231,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -48620,7 +48372,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +273,7 @@
+@@ -373,6 +273,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -48628,7 +48380,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +282,12 @@
+@@ -381,9 +282,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -48642,7 +48394,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,31 +318,39 @@
+@@ -414,31 +318,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -48671,8 +48423,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -48701,7 +48453,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +358,6 @@
+@@ -446,10 +358,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -48712,7 +48464,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -453,7 +365,13 @@
+@@ -457,7 +365,13 @@
# (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):
@@ -48727,7 +48479,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +383,20 @@
+@@ -469,15 +383,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48752,7 +48504,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +417,7 @@
+@@ -498,7 +417,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48761,7 +48513,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +428,30 @@
+@@ -509,35 +428,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -48780,7 +48532,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -48804,7 +48556,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +459,23 @@
+@@ -545,23 +459,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -48837,7 +48589,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +487,23 @@
+@@ -573,29 +487,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48880,7 +48632,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +514,19 @@
+@@ -606,15 +514,19 @@
|| exit 1; \
fi; \
done
@@ -48905,7 +48657,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +537,6 @@
+@@ -625,7 +537,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -48913,7 +48665,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +556,7 @@
+@@ -645,7 +556,7 @@
clean-generic:
distclean-generic:
@@ -48922,7 +48674,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +567,34 @@
+@@ -656,25 +567,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -48959,7 +48711,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +613,24 @@
+@@ -693,26 +613,24 @@
ps-am:
@@ -49002,12 +48754,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.16.1/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.16.1.old/modules/printbackends/cups/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/printbackends/cups/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.16.2/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/cups/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/cups/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49158,7 +48910,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +182,14 @@
+@@ -149,95 +182,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -49177,6 +48929,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -49251,7 +49007,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +213,15 @@
+@@ -261,24 +213,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -49277,7 +49033,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +234,6 @@
+@@ -291,8 +234,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -49286,7 +49042,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +245,10 @@
+@@ -304,28 +245,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -49315,7 +49071,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +257,25 @@
+@@ -334,22 +257,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -49345,7 +49101,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +299,7 @@
+@@ -373,6 +299,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -49353,7 +49109,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +308,12 @@
+@@ -381,9 +308,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -49367,7 +49123,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +344,7 @@
+@@ -414,9 +344,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -49377,7 +49133,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk \
-@@ -424,107 +356,90 @@
+@@ -428,107 +356,90 @@
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS)
@@ -49449,8 +49205,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -49522,7 +49278,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -534,37 +449,25 @@
+@@ -538,37 +449,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintercups.Plo at am__quote@
.c.o:
@@ -49572,7 +49328,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -572,26 +475,15 @@
+@@ -576,26 +475,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -49595,14 +49351,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -601,23 +493,23 @@
+@@ -605,23 +493,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -49635,7 +49391,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -629,29 +521,23 @@
+@@ -633,29 +521,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -49678,7 +49434,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -666,9 +552,10 @@
+@@ -670,9 +552,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -49691,7 +49447,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -688,7 +575,7 @@
+@@ -692,7 +575,7 @@
clean-generic:
distclean-generic:
@@ -49700,7 +49456,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -702,24 +589,34 @@
+@@ -706,24 +589,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -49736,7 +49492,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -740,20 +637,24 @@
+@@ -744,20 +637,24 @@
ps-am:
@@ -49772,12 +49528,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.16.1/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.16.1.old/modules/printbackends/file/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/printbackends/file/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.16.2/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/file/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/file/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49928,7 +49684,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +182,14 @@
+@@ -149,95 +182,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -49947,6 +49703,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -50021,7 +49781,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +213,15 @@
+@@ -261,24 +213,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -50047,7 +49807,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +234,6 @@
+@@ -291,8 +234,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -50056,7 +49816,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +245,10 @@
+@@ -304,28 +245,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -50085,7 +49845,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +257,25 @@
+@@ -334,22 +257,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -50115,7 +49875,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +299,7 @@
+@@ -373,6 +299,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -50123,7 +49883,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +308,12 @@
+@@ -381,9 +308,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -50137,7 +49897,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,17 +344,12 @@
+@@ -414,17 +344,12 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -50155,7 +49915,7 @@
libprintbackend_file_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk \
-@@ -430,100 +359,86 @@
+@@ -434,100 +359,86 @@
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(AM_CPPFLAGS)
@@ -50220,8 +49980,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -50293,7 +50053,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -531,70 +446,32 @@
+@@ -535,70 +446,32 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo at am__quote@
.c.o:
@@ -50380,7 +50140,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -602,26 +479,15 @@
+@@ -606,26 +479,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -50403,14 +50163,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -631,23 +497,23 @@
+@@ -635,23 +497,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -50443,7 +50203,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -659,29 +525,23 @@
+@@ -663,29 +525,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50486,7 +50246,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -696,9 +556,10 @@
+@@ -700,9 +556,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -50499,7 +50259,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -718,7 +579,7 @@
+@@ -722,7 +579,7 @@
clean-generic:
distclean-generic:
@@ -50508,7 +50268,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -732,24 +593,34 @@
+@@ -736,24 +593,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -50544,7 +50304,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -770,20 +641,24 @@
+@@ -774,20 +641,24 @@
ps-am:
@@ -50580,12 +50340,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.16.1/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.16.1.old/modules/printbackends/lpr/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/printbackends/lpr/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.16.2/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/lpr/Makefile.in 2009-05-31 06:11:07.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/lpr/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50733,7 +50493,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +179,14 @@
+@@ -149,95 +179,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -50752,6 +50512,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -50826,7 +50590,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +210,15 @@
+@@ -261,24 +210,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -50852,7 +50616,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +231,6 @@
+@@ -291,8 +231,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -50861,7 +50625,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +242,10 @@
+@@ -304,28 +242,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -50890,7 +50654,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +254,25 @@
+@@ -334,22 +254,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -50920,7 +50684,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +296,7 @@
+@@ -373,6 +296,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -50928,7 +50692,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +305,12 @@
+@@ -381,9 +305,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -50942,7 +50706,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +341,7 @@
+@@ -414,9 +341,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -50952,7 +50716,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk \
-@@ -423,98 +352,85 @@
+@@ -427,98 +352,85 @@
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS)
@@ -51015,8 +50779,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -51088,7 +50852,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -522,37 +438,25 @@
+@@ -526,37 +438,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintbackendlpr.Plo at am__quote@
.c.o:
@@ -51138,7 +50902,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -560,26 +464,15 @@
+@@ -564,26 +464,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -51161,14 +50925,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -589,23 +482,23 @@
+@@ -593,23 +482,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -51201,7 +50965,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -617,29 +510,23 @@
+@@ -621,29 +510,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51244,7 +51008,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -654,9 +541,10 @@
+@@ -658,9 +541,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -51257,7 +51021,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -676,7 +564,7 @@
+@@ -680,7 +564,7 @@
clean-generic:
distclean-generic:
@@ -51266,7 +51030,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -690,24 +578,34 @@
+@@ -694,24 +578,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -51302,7 +51066,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -728,20 +626,24 @@
+@@ -732,20 +626,24 @@
ps-am:
@@ -51338,12 +51102,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/printbackends/Makefile.in gtk+2.0-2.16.1/modules/printbackends/Makefile.in
---- gtk+2.0-2.16.1.old/modules/printbackends/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/printbackends/Makefile.in 2009-04-12 11:21:22.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/Makefile.in gtk+2.0-2.16.2/modules/printbackends/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/Makefile.in 2009-05-31 06:11:06.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51371,7 +51135,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,12 +31,36 @@
+@@ -37,13 +31,37 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -51381,6 +51145,7 @@
+ $(top_srcdir)/Makefile.decl
@HAVE_CUPS_TRUE at am__append_1 = cups
@TEST_PRINT_BACKEND_TRUE at am__append_2 = test
+ @HAVE_PAPI_TRUE at am__append_3 = papi
+subdir = modules/printbackends
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51410,7 +51175,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -53,22 +71,17 @@
+@@ -54,22 +72,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -51434,7 +51199,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -83,8 +96,6 @@
+@@ -84,8 +97,6 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -51443,7 +51208,7 @@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-@@ -92,10 +103,6 @@
+@@ -93,10 +104,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -51454,7 +51219,7 @@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
-@@ -121,6 +128,7 @@
+@@ -122,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@
@@ -51462,7 +51227,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -139,8 +147,6 @@
+@@ -140,8 +148,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -51471,7 +51236,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -151,91 +157,14 @@
+@@ -152,95 +158,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -51490,6 +51255,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -51564,7 +51333,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -259,24 +188,15 @@
+@@ -264,24 +189,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -51590,7 +51359,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -289,8 +209,6 @@
+@@ -294,8 +210,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -51599,7 +51368,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -302,28 +220,10 @@
+@@ -307,28 +221,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -51628,7 +51397,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -332,22 +232,25 @@
+@@ -337,22 +233,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -51658,7 +51427,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -371,6 +274,7 @@
+@@ -376,6 +275,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -51666,7 +51435,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -379,9 +283,12 @@
+@@ -384,9 +284,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -51680,14 +51449,14 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -412,32 +319,40 @@
+@@ -417,32 +320,40 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-
- SUBDIRS = file lpr $(am__append_1) $(am__append_2)
--
- DIST_SUBDIRS = cups file lpr test
+ SUBDIRS = file lpr $(am__append_1) $(am__append_2) $(am__append_3)
+-
+ DIST_SUBDIRS = cups file lpr test papi
-subdir = modules/printbackends
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -51710,8 +51479,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -51740,7 +51509,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -445,10 +360,6 @@
+@@ -450,10 +361,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -51751,7 +51520,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -456,7 +367,13 @@
+@@ -461,7 +368,13 @@
# (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):
@@ -51766,7 +51535,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,15 +385,20 @@
+@@ -473,15 +386,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51791,7 +51560,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +419,7 @@
+@@ -502,7 +420,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51800,7 +51569,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -508,35 +430,30 @@
+@@ -513,35 +431,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -51819,7 +51588,7 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
@@ -51843,7 +51612,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -544,23 +461,23 @@
+@@ -549,23 +462,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -51876,7 +51645,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -572,29 +489,23 @@
+@@ -577,29 +490,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51919,7 +51688,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -607,13 +518,17 @@
+@@ -612,13 +519,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -51941,7 +51710,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -624,7 +539,6 @@
+@@ -629,7 +540,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -51949,7 +51718,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -644,7 +558,7 @@
+@@ -649,7 +559,7 @@
clean-generic:
distclean-generic:
@@ -51958,7 +51727,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -655,25 +569,34 @@
+@@ -660,25 +570,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -51995,7 +51764,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -692,26 +615,24 @@
+@@ -697,26 +616,24 @@
ps-am:
@@ -52038,12 +51807,769 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.16.1/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.16.1.old/modules/printbackends/test/Makefile.in 2009-04-11 21:55:34.000000000 +0200
-+++ gtk+2.0-2.16.1/modules/printbackends/test/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.16.2/modules/printbackends/papi/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/papi/Makefile.in 2009-05-31 06:11:07.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/papi/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,16 +14,12 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
++
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -35,10 +31,58 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++subdir = modules/printbackends/papi
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(backenddir)"
++backendLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(backend_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
++ $(top_builddir)/gtk/$(gtktargetlib)
++libprintbackend_papi_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
++am_libprintbackend_papi_la_OBJECTS = gtkprinterpapi.lo \
++ gtkprintbackendpapi.lo
++libprintbackend_papi_la_OBJECTS = \
++ $(am_libprintbackend_papi_la_OBJECTS)
++libprintbackend_papi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libprintbackend_papi_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
++SOURCES = $(libprintbackend_papi_la_SOURCES)
++DIST_SOURCES = $(libprintbackend_papi_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -49,22 +93,17 @@
+ AWK = @AWK@
+ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
+ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
+-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@
+-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@
+-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@
+-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@
+ CAIRO_PREFIX = @CAIRO_PREFIX@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCAS = @CCAS@
++CCASDEPMODE = @CCASDEPMODE@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
+-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
+ CUPS_API_MAJOR = @CUPS_API_MAJOR@
+ CUPS_API_MINOR = @CUPS_API_MINOR@
+ CUPS_CFLAGS = @CUPS_CFLAGS@
+@@ -79,8 +118,6 @@
+ DB2HTML = @DB2HTML@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
+-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
+ DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+@@ -88,10 +125,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
+-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+ GAIL_INET_LIBS = @GAIL_INET_LIBS@
+@@ -117,6 +150,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@
+@@ -135,8 +169,6 @@
+ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
+ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
+ GTK_DEP_LIBS = @GTK_DEP_LIBS@
+-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
+ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
+ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
+@@ -147,95 +179,14 @@
+ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+ GTK_VERSION = @GTK_VERSION@
+ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
+-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@
+-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@
+-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
+-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
+-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@
+-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@
+ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@
+-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@
+-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@
+-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@
+-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@
+-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@
+-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
+-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
+-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
+-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
+-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
+-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
+-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@
+-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@
+-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@
+ HTML_DIR = @HTML_DIR@
+ INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@
+ INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@
+ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@
+ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@
+-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@
+-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@
+-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@
+-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@
+-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@
+-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@
+-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@
+-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@
+-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@
+-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@
+-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@
+-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@
+-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@
+-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@
+-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@
+-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@
+-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@
+-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@
+-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@
+-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@
+-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@
+-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@
+-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@
+-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@
+-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@
+-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@
+-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@
+-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@
+-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@
+-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@
+-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@
+-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@
+-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@
+-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@
+-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@
+-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@
+-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@
+-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@
+-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@
+-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@
+-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@
+-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@
+-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@
+-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@
+-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@
+-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@
+-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@
+-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@
+-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@
+-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@
+-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@
+-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@
+-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@
+-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@
+-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@
+-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@
+-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@
+-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@
+ INDENT = @INDENT@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -259,24 +210,15 @@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
+-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+-OS_LINUX_FALSE = @OS_LINUX_FALSE@
+-OS_LINUX_TRUE = @OS_LINUX_TRUE@
+-OS_UNIX_FALSE = @OS_UNIX_FALSE@
+-OS_UNIX_TRUE = @OS_UNIX_TRUE@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ OTOOL = @OTOOL@
+ OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+@@ -289,8 +231,6 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PERL = @PERL@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+@@ -302,28 +242,10 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@
+-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@
+-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@
+-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@
+-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@
+-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@
+-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@
+-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@
+-USE_MMX_FALSE = @USE_MMX_FALSE@
+-USE_MMX_TRUE = @USE_MMX_TRUE@
+ USE_NLS = @USE_NLS@
+-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@
+-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@
+-USE_WIN32_FALSE = @USE_WIN32_FALSE@
+-USE_WIN32_TRUE = @USE_WIN32_TRUE@
+-USE_X11_FALSE = @USE_X11_FALSE@
+-USE_X11_TRUE = @USE_X11_TRUE@
+ VERSION = @VERSION@
+ WINDRES = @WINDRES@
+ XGETTEXT = @XGETTEXT@
+-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@
+-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@
+ XMKMF = @XMKMF@
+ XMLCATALOG = @XMLCATALOG@
+ XML_CATALOG_FILE = @XML_CATALOG_FILE@
+@@ -332,22 +254,25 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -371,6 +296,7 @@
+ localstatedir = @localstatedir@
+ lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -379,10 +305,13 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @OS_WIN32_TRUE at no_undefined = -no-undefined
+-
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/gtk \
+@@ -393,101 +322,87 @@
+ $(GTK_DEP_CFLAGS) \
+ $(GTK_DEBUG_FLAGS)
+
+-
+ LDADDS = \
+ $(GTK_DEP_LIBS) \
+ $(top_builddir)/gtk/$(gtktargetlib)
+
+-
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+-
+ backend_LTLIBRARIES = libprintbackend-papi.la
+-
+ libprintbackend_papi_la_SOURCES = \
+ gtkprinterpapi.c \
+ gtkprintbackendpapi.c
+
+-
+ noinst_HEADERS = \
+ gtkprinterpapi.h \
+ gtkprintbackendpapi.h
+
+-
+ libprintbackend_papi_la_LDFLAGS = -avoid-version -module $(no_undefined)
+ libprintbackend_papi_la_LIBADD = $(LDADDS) -lpapi
+-subdir = modules/printbackends/papi
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(backend_LTLIBRARIES)
+-
+-libprintbackend_papi_la_DEPENDENCIES = \
+- $(top_builddir)/gtk/$(gtktargetlib)
+-am_libprintbackend_papi_la_OBJECTS = gtkprinterpapi.lo \
+- gtkprintbackendpapi.lo
+-libprintbackend_papi_la_OBJECTS = $(am_libprintbackend_papi_la_OBJECTS)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkprintbackendpapi.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gtkprinterpapi.Plo
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libprintbackend_papi_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libprintbackend_papi_la_SOURCES)
+-
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/papi/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/printbackends/papi/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-backendLTLIBRARIES_INSTALL = $(INSTALL)
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-backendLTLIBRARIES: $(backend_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
+- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
+ else :; fi; \
+ done
+
+ uninstall-backendLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
+ done
+
+ clean-backendLTLIBRARIES:
+ -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" = "$$p" && dir=.; \
++ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libprintbackend-papi.la: $(libprintbackend_papi_la_OBJECTS) $(libprintbackend_papi_la_DEPENDENCIES)
+- $(LINK) -rpath $(backenddir) $(libprintbackend_papi_la_LDFLAGS) $(libprintbackend_papi_la_OBJECTS) $(libprintbackend_papi_la_LIBADD) $(LIBS)
++ $(libprintbackend_papi_la_LINK) -rpath $(backenddir) $(libprintbackend_papi_la_OBJECTS) $(libprintbackend_papi_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -496,37 +411,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprinterpapi.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -534,26 +437,15 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
++tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -563,23 +455,23 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(ETAGS_ARGS)$$tags$$unique" \
+- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique
+-
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -591,28 +483,23 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -626,9 +513,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ for dir in "$(DESTDIR)$(backenddir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -648,7 +536,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -rm -f $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -662,24 +550,34 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
++html: html-am
++
+ info: info-am
+
+ info-am:
+
+ install-data-am: install-backendLTLIBRARIES
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -700,20 +598,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
++uninstall-am: uninstall-backendLTLIBRARIES
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-backendLTLIBRARIES clean-generic clean-libtool ctags \
+- distclean distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am info info-am install \
+- install-am install-backendLTLIBRARIES install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \
+- uninstall-info-am
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am \
++ install-backendLTLIBRARIES install-data install-data-am \
++ install-dvi install-dvi-am install-exec install-exec-am \
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-backendLTLIBRARIES
+
+
+ -include $(top_srcdir)/git.mk
+diff -Naur gtk+2.0-2.16.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.16.2/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.16.2.old/modules/printbackends/test/Makefile.in 2009-05-31 06:11:07.000000000 +0200
++++ gtk+2.0-2.16.2/modules/printbackends/test/Makefile.in 2009-06-02 07:42:52.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52193,7 +52719,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +181,14 @@
+@@ -149,95 +181,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -52212,6 +52738,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -52286,7 +52816,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +212,15 @@
+@@ -261,24 +212,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -52312,7 +52842,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +233,6 @@
+@@ -291,8 +233,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -52321,7 +52851,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +244,10 @@
+@@ -304,28 +244,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -52350,7 +52880,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +256,25 @@
+@@ -334,22 +256,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -52380,7 +52910,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +298,7 @@
+@@ -373,6 +298,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -52388,7 +52918,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +307,12 @@
+@@ -381,9 +307,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -52402,7 +52932,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,17 +343,12 @@
+@@ -414,17 +343,12 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -52420,7 +52950,7 @@
libprintbackend_test_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk \
-@@ -430,98 +358,85 @@
+@@ -434,98 +358,85 @@
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(AM_CPPFLAGS)
@@ -52483,8 +53013,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -52556,7 +53086,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -529,70 +444,32 @@
+@@ -533,70 +444,32 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo at am__quote@
.c.o:
@@ -52643,7 +53173,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -600,26 +477,15 @@
+@@ -604,26 +477,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -52666,14 +53196,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -629,23 +495,23 @@
+@@ -633,23 +495,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -52706,7 +53236,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -657,29 +523,23 @@
+@@ -661,29 +523,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -52749,7 +53279,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -694,9 +554,10 @@
+@@ -698,9 +554,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -52762,7 +53292,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -716,7 +577,7 @@
+@@ -720,7 +577,7 @@
clean-generic:
distclean-generic:
@@ -52771,7 +53301,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -730,24 +591,34 @@
+@@ -734,24 +591,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -52807,7 +53337,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -768,20 +639,24 @@
+@@ -772,20 +639,24 @@
ps-am:
@@ -52843,12 +53373,12 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/perf/Makefile.in gtk+2.0-2.16.1/perf/Makefile.in
---- gtk+2.0-2.16.1.old/perf/Makefile.in 2009-04-11 21:55:35.000000000 +0200
-+++ gtk+2.0-2.16.1/perf/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/perf/Makefile.in gtk+2.0-2.16.2/perf/Makefile.in
+--- gtk+2.0-2.16.2.old/perf/Makefile.in 2009-05-31 06:11:07.000000000 +0200
++++ gtk+2.0-2.16.2/perf/Makefile.in 2009-06-02 07:42:52.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52982,7 +53512,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,91 +165,14 @@
+@@ -149,95 +165,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -53001,6 +53531,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -53075,7 +53609,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -257,24 +196,15 @@
+@@ -261,24 +196,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -53101,7 +53635,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -287,8 +217,6 @@
+@@ -291,8 +217,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -53110,7 +53644,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +228,10 @@
+@@ -304,28 +228,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -53139,7 +53673,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +240,25 @@
+@@ -334,22 +240,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -53169,7 +53703,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,6 +282,7 @@
+@@ -373,6 +282,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -53177,7 +53711,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,20 +291,18 @@
+@@ -381,20 +291,18 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -53204,7 +53738,7 @@
TEST_PROGS =
### testing rules
-@@ -416,7 +328,6 @@
+@@ -420,7 +328,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -53212,7 +53746,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -426,27 +337,18 @@
+@@ -430,27 +337,18 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -53240,7 +53774,7 @@
testperf_SOURCES = \
appwindow.c \
gtkwidgetprofiler.c \
-@@ -460,68 +362,54 @@
+@@ -464,68 +362,54 @@
typebuiltins.h \
widgets.h
@@ -53306,8 +53840,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -53336,7 +53870,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -531,10 +419,10 @@
+@@ -535,10 +419,10 @@
done
testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES)
@rm -f testperf$(EXEEXT)
@@ -53349,7 +53883,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -548,37 +436,25 @@
+@@ -552,37 +436,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/typebuiltins.Po at am__quote@
.c.o:
@@ -53399,7 +53933,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -586,26 +462,15 @@
+@@ -590,26 +462,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -53422,14 +53956,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -615,23 +480,23 @@
+@@ -619,23 +480,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -53462,7 +53996,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -643,29 +508,23 @@
+@@ -647,29 +508,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -53505,7 +54039,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -681,7 +540,6 @@
+@@ -685,7 +540,6 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS)
@@ -53513,7 +54047,7 @@
installdirs:
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -703,13 +561,13 @@
+@@ -707,13 +561,13 @@
clean-generic:
distclean-generic:
@@ -53529,7 +54063,7 @@
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-@@ -719,24 +577,34 @@
+@@ -723,24 +577,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -53565,7 +54099,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -757,18 +625,23 @@
+@@ -761,18 +625,23 @@
ps-am:
@@ -53598,9 +54132,9 @@
# call as: $(XVFB_START) && someprogram
-diff -Naur gtk+2.0-2.16.1.old/po/Makefile.in.in gtk+2.0-2.16.1/po/Makefile.in.in
---- gtk+2.0-2.16.1.old/po/Makefile.in.in 2009-04-04 06:51:46.000000000 +0200
-+++ gtk+2.0-2.16.1/po/Makefile.in.in 2009-04-12 11:21:10.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/po/Makefile.in.in gtk+2.0-2.16.2/po/Makefile.in.in
+--- gtk+2.0-2.16.2.old/po/Makefile.in.in 2009-05-03 18:39:15.000000000 +0200
++++ gtk+2.0-2.16.2/po/Makefile.in.in 2009-06-02 07:42:34.000000000 +0200
@@ -25,6 +25,7 @@
prefix = @prefix@
@@ -53655,12 +54189,12 @@
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-diff -Naur gtk+2.0-2.16.1.old/tests/Makefile.in gtk+2.0-2.16.1/tests/Makefile.in
---- gtk+2.0-2.16.1.old/tests/Makefile.in 2009-04-11 21:55:35.000000000 +0200
-+++ gtk+2.0-2.16.1/tests/Makefile.in 2009-04-12 11:21:23.000000000 +0200
+diff -Naur gtk+2.0-2.16.2.old/tests/Makefile.in gtk+2.0-2.16.2/tests/Makefile.in
+--- gtk+2.0-2.16.2.old/tests/Makefile.in 2009-05-31 06:11:07.000000000 +0200
++++ gtk+2.0-2.16.2/tests/Makefile.in 2009-06-02 07:42:53.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -54036,7 +54570,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -151,91 +407,14 @@
+@@ -151,95 +407,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -54055,6 +54589,10 @@
-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@
-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@
-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@
+-HAVE_PAPI_CUPS_FALSE = @HAVE_PAPI_CUPS_FALSE@
+-HAVE_PAPI_CUPS_TRUE = @HAVE_PAPI_CUPS_TRUE@
+-HAVE_PAPI_FALSE = @HAVE_PAPI_FALSE@
+-HAVE_PAPI_TRUE = @HAVE_PAPI_TRUE@
-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@
-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@
-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@
@@ -54129,7 +54667,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -259,24 +438,15 @@
+@@ -263,24 +438,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -54155,7 +54693,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -289,8 +459,6 @@
+@@ -293,8 +459,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -54164,7 +54702,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -302,28 +470,10 @@
+@@ -306,28 +470,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -54193,7 +54731,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -332,22 +482,25 @@
+@@ -336,22 +482,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -54223,7 +54761,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -371,6 +524,7 @@
+@@ -375,6 +524,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -54231,7 +54769,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -379,37 +533,22 @@
+@@ -383,37 +533,22 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -54278,7 +54816,7 @@
TEST_PROGS =
### testing rules
-@@ -435,7 +574,6 @@
+@@ -439,7 +574,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -54286,7 +54824,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -445,92 +583,21 @@
+@@ -449,92 +583,21 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -54381,7 +54919,7 @@
simple_DEPENDENCIES = $(TEST_DEPS)
print_editor_DEPENDENCIES = $(TEST_DEPS)
testicontheme_DEPENDENCIES = $(TEST_DEPS)
-@@ -588,7 +655,6 @@
+@@ -592,7 +655,6 @@
testgrouping_DEPENDENCIES = $(TEST_DEPS)
testtooltips_DEPENDENCIES = $(TEST_DEPS)
testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
@@ -54389,7 +54927,7 @@
simple_LDADD = $(LDADDS)
print_editor_LDADD = $(LDADDS)
testaccel_LDADD = $(LDADDS)
-@@ -653,732 +719,129 @@
+@@ -657,732 +719,129 @@
testgrouping_LDADD = $(LDADDS)
testtooltips_LDADD = $(LDADDS)
testvolumebutton_LDADD = $(LDADDS)
@@ -55119,8 +55657,8 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
@@ -55149,7 +55687,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -1388,202 +851,202 @@
+@@ -1392,202 +851,202 @@
done
autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES)
@rm -f autotestkeywords$(EXEEXT)
@@ -55418,7 +55956,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -1658,130 +1121,76 @@
+@@ -1662,130 +1121,76 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/treestoretest.Po at am__quote@
.c.o:
@@ -55575,14 +56113,14 @@
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1791,23 +1200,23 @@
+@@ -1795,23 +1200,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -55615,19 +56153,16 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1821,9 +1230,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
+@@ -1827,7 +1232,7 @@
check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
+ list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1832,25 +1241,25 @@
+@@ -1836,25 +1241,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -55635,7 +56170,7 @@
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
@@ -55651,7 +56186,7 @@
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
-+ *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
@@ -55663,11 +56198,46 @@
;; \
esac; \
else \
-@@ -1875,46 +1284,40 @@
+@@ -1862,63 +1267,70 @@
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
skipped=""; \
if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
+- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
@@ -55727,7 +56297,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1929,7 +1332,6 @@
+@@ -1933,7 +1345,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -55735,7 +56305,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -1950,7 +1352,7 @@
+@@ -1954,7 +1365,7 @@
clean-generic:
distclean-generic:
@@ -55744,7 +56314,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1964,24 +1366,34 @@
+@@ -1968,24 +1379,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -55780,7 +56350,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -2002,18 +1414,23 @@
+@@ -2006,18 +1427,23 @@
ps-am:
Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=20217&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Tue Jun 2 05:45:12 2009
@@ -15,4 +15,3 @@
060_ignore-random-icons.patch
061_use_pdf_as_default_printing_standard.patch
070_mandatory-relibtoolize.patch
-091_workaround_no_gtk_init_incorrect_display.patch
More information about the pkg-gnome-commits
mailing list