From c607cab29216fd0d9efe736d22d397bba8485eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 4 Jan 2010 09:44:28 +0000 Subject: [PATCH] * New upstream development release: + debian/patches/070_mandatory-relibtoolize.patch: - Regenerated for the new version. + debian/rules, debian/libgtk-directfb-2.0-0.symbols, debian/libgtk2.0-0.symbols: - Update SHVER to 2.19.2 for the new API and add new symbols. --- debian/changelog | 14 +- debian/control | 2 +- debian/libgtk-directfb-2.0-0.symbols | 6 + debian/libgtk2.0-0.symbols | 6 + .../patches/070_mandatory-relibtoolize.patch | 6451 ++++++++++------- debian/rules | 2 +- 6 files changed, 3687 insertions(+), 2794 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c5dbb82c7..12bca49602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ -gtk+2.0 (2.19.1-1.1) UNRELEASED; urgency=low +gtk+2.0 (2.19.2-1) experimental; urgency=low + [ Emilio Pozuelo Monfort ] * debian/patches/000_gtk+-2.0.6-exportsymbols.patch: + Removed, it wasn't being applied and hasn't been relevant for a long time. - -- Emilio Pozuelo Monfort Sun, 13 Dec 2009 00:30:18 +0100 + [ Sebastian Dröge ] + * New upstream development release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + debian/rules, + debian/libgtk-directfb-2.0-0.symbols, + debian/libgtk2.0-0.symbols: + - Update SHVER to 2.19.2 for the new API and add new symbols. + + -- Sebastian Dröge Mon, 04 Jan 2010 10:43:48 +0100 gtk+2.0 (2.19.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 87015f0f36..58eb856ea3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+2.0 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Sebastian Dröge Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, diff --git a/debian/libgtk-directfb-2.0-0.symbols b/debian/libgtk-directfb-2.0-0.symbols index c150d44498..80ba38dcec 100644 --- a/debian/libgtk-directfb-2.0-0.symbols +++ b/debian/libgtk-directfb-2.0-0.symbols @@ -346,6 +346,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_keymap_get_for_display@Base 2.8.0 gdk_keymap_get_type@Base 2.8.0 gdk_keymap_lookup_key@Base 2.8.0 + gdk_keymap_map_virtual_modifiers@Base 2.19.2 gdk_keymap_translate_keyboard_state@Base 2.8.0 gdk_keyval_from_name@Base 2.8.0 gdk_keyval_is_lower@Base 2.8.0 @@ -472,6 +473,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_screen_get_monitor_width_mm@Base 2.14.0 gdk_screen_get_n_monitors@Base 2.8.0 gdk_screen_get_number@Base 2.8.0 + gdk_screen_get_primary_monitor@Base 2.19.2 gdk_screen_get_resolution@Base 2.10.0 gdk_screen_get_rgb_colormap@Base 2.8.0 gdk_screen_get_rgb_visual@Base 2.8.0 @@ -2638,6 +2640,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_print_context_get_cairo_context@Base 2.10.0 gtk_print_context_get_dpi_x@Base 2.10.0 gtk_print_context_get_dpi_y@Base 2.10.0 + gtk_print_context_get_hard_margins@Base 2.19.2 gtk_print_context_get_height@Base 2.10.0 gtk_print_context_get_page_setup@Base 2.10.0 gtk_print_context_get_pango_fontmap@Base 2.10.0 @@ -2802,6 +2805,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_printer_get_capabilities@Base 2.12.0 gtk_printer_get_default_page_size@Base 2.14.0 gtk_printer_get_description@Base 2.10.0 + gtk_printer_get_hard_margins@Base 2.19.2 gtk_printer_get_icon_name@Base 2.10.0 gtk_printer_get_job_count@Base 2.10.0 gtk_printer_get_location@Base 2.10.0 @@ -4494,6 +4498,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_window_get_icon_list@Base 2.8.0 gtk_window_get_icon_name@Base 2.8.0 gtk_window_get_mnemonic_modifier@Base 2.8.0 + gtk_window_get_mnemonics_visible@Base 2.19.2 gtk_window_get_modal@Base 2.8.0 gtk_window_get_opacity@Base 2.12.0 gtk_window_get_position@Base 2.8.0 @@ -4556,6 +4561,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_window_set_keep_above@Base 2.8.0 gtk_window_set_keep_below@Base 2.8.0 gtk_window_set_mnemonic_modifier@Base 2.8.0 + gtk_window_set_mnemonics_visible@Base 2.19.2 gtk_window_set_modal@Base 2.8.0 gtk_window_set_opacity@Base 2.12.0 gtk_window_set_policy@Base 2.8.0 diff --git a/debian/libgtk2.0-0.symbols b/debian/libgtk2.0-0.symbols index 69d0b4c2e2..ed741c8b4c 100644 --- a/debian/libgtk2.0-0.symbols +++ b/debian/libgtk2.0-0.symbols @@ -305,6 +305,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_keymap_get_type@Base 2.8.0 gdk_keymap_have_bidi_layouts@Base 2.12.0 gdk_keymap_lookup_key@Base 2.8.0 + gdk_keymap_map_virtual_modifiers@Base 2.19.2 gdk_keymap_translate_keyboard_state@Base 2.8.0 gdk_keyval_convert_case@Base 2.8.0 gdk_keyval_from_name@Base 2.8.0 @@ -430,6 +431,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_screen_get_monitor_width_mm@Base 2.14.0 gdk_screen_get_n_monitors@Base 2.8.0 gdk_screen_get_number@Base 2.8.0 + gdk_screen_get_primary_monitor@Base 2.19.2 gdk_screen_get_resolution@Base 2.10.0 gdk_screen_get_rgb_colormap@Base 2.8.0 gdk_screen_get_rgb_visual@Base 2.8.0 @@ -2785,6 +2787,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_print_context_get_cairo_context@Base 2.10.0 gtk_print_context_get_dpi_x@Base 2.10.0 gtk_print_context_get_dpi_y@Base 2.10.0 + gtk_print_context_get_hard_margins@Base 2.19.2 gtk_print_context_get_height@Base 2.10.0 gtk_print_context_get_page_setup@Base 2.10.0 gtk_print_context_get_pango_fontmap@Base 2.10.0 @@ -2949,6 +2952,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_printer_get_capabilities@Base 2.12.0 gtk_printer_get_default_page_size@Base 2.14.0 gtk_printer_get_description@Base 2.10.0 + gtk_printer_get_hard_margins@Base 2.19.2 gtk_printer_get_icon_name@Base 2.10.0 gtk_printer_get_job_count@Base 2.10.0 gtk_printer_get_location@Base 2.10.0 @@ -4642,6 +4646,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_window_get_icon_list@Base 2.8.0 gtk_window_get_icon_name@Base 2.8.0 gtk_window_get_mnemonic_modifier@Base 2.8.0 + gtk_window_get_mnemonics_visible@Base 2.19.2 gtk_window_get_modal@Base 2.8.0 gtk_window_get_opacity@Base 2.12.0 gtk_window_get_position@Base 2.8.0 @@ -4704,6 +4709,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_window_set_keep_above@Base 2.8.0 gtk_window_set_keep_below@Base 2.8.0 gtk_window_set_mnemonic_modifier@Base 2.8.0 + gtk_window_set_mnemonics_visible@Base 2.19.2 gtk_window_set_modal@Base 2.8.0 gtk_window_set_opacity@Base 2.12.0 gtk_window_set_policy@Base 2.8.0 diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 06518195d2..56bd0452bb 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,6 +1,12 @@ -diff -Naur gtk+2.0-2.19.1.old/aclocal.m4 gtk+2.0-2.19.1/aclocal.m4 ---- gtk+2.0-2.19.1.old/aclocal.m4 2009-11-30 22:17:25.000000000 +0100 -+++ gtk+2.0-2.19.1/aclocal.m4 2009-12-01 16:03:29.707292349 +0100 +diff -Naur gtk+2.0-2.19.2.old/aclocal.m4 gtk+2.0-2.19.2/aclocal.m4 +--- gtk+2.0-2.19.2.old/aclocal.m4 2009-12-22 03:42:28.000000000 +0100 ++++ gtk+2.0-2.19.2/aclocal.m4 2010-01-04 10:42:22.480520082 +0100 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.11 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], @@ -23,153 +29,7 @@ diff -Naur gtk+2.0-2.19.1.old/aclocal.m4 gtk+2.0-2.19.1/aclocal.m4 /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); -@@ -675,12 +674,6 @@ - [ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- -- dnl check for tools we added during development -- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) -- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) -- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) -- - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -@@ -699,32 +692,16 @@ - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, -- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) -+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) - fi - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - -- dnl enable/disable output formats -- AC_ARG_ENABLE([gtk-doc-html], -- AS_HELP_STRING([--enable-gtk-doc-html], -- [build documentation in html format [[default=yes]]]),, -- [enable_gtk_doc_html=yes]) -- AC_ARG_ENABLE([gtk-doc-pdf], -- AS_HELP_STRING([--enable-gtk-doc-pdf], -- [build documentation in pdf format [[default=no]]]),, -- [enable_gtk_doc_pdf=no]) -- -- if test -z "$GTKDOC_MKPDF"; then -- enable_gtk_doc_pdf=no -- fi -- -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) - - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) -- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) - ]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -@@ -3193,13 +3170,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # Add ABI-specific directories to the system library path. -- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -3211,6 +3185,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3802,7 +3788,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - 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 -@@ -4483,7 +4469,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -4908,6 +4894,9 @@ - cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -4972,6 +4961,9 @@ - openbsd*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -5154,7 +5146,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5329,6 +5321,7 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -5567,7 +5560,7 @@ - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - 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 -@@ -8744,14 +8737,16 @@ +@@ -733,14 +732,16 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], @@ -194,7 +54,7 @@ diff -Naur gtk+2.0-2.19.1.old/aclocal.m4 gtk+2.0-2.19.1/aclocal.m4 fi[]dnl ])# _PKG_CONFIG -@@ -8795,9 +8790,9 @@ +@@ -784,9 +785,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then @@ -206,9 +66,51 @@ diff -Naur gtk+2.0-2.19.1.old/aclocal.m4 gtk+2.0-2.19.1/aclocal.m4 fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -diff -Naur gtk+2.0-2.19.1.old/config.h.in gtk+2.0-2.19.1/config.h.in ---- gtk+2.0-2.19.1.old/config.h.in 2009-11-30 22:17:28.000000000 +0100 -+++ gtk+2.0-2.19.1/config.h.in 2009-12-01 16:03:31.820294705 +0100 +@@ -836,7 +837,7 @@ + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11.1], [], ++m4_if([$1], [1.11], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -852,7 +853,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11.1])dnl ++[AM_AUTOMAKE_VERSION([1.11])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +diff -Naur gtk+2.0-2.19.2.old/compile gtk+2.0-2.19.2/compile +--- gtk+2.0-2.19.2.old/compile 2009-12-10 16:29:51.000000000 +0100 ++++ gtk+2.0-2.19.2/compile 2010-01-04 10:42:30.636524046 +0100 +@@ -1,7 +1,7 @@ + #! /bin/sh + # Wrapper for compilers which do not understand `-c -o'. + +-scriptversion=2009-10-06.20; # UTC ++scriptversion=2009-04-28.21; # UTC + + # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software + # Foundation, Inc. +@@ -124,9 +124,9 @@ + ret=$? + + if test -f "$cofile"; then +- test "$cofile" = "$ofile" || mv "$cofile" "$ofile" ++ mv "$cofile" "$ofile" + elif test -f "${cofile}bj"; then +- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" ++ mv "${cofile}bj" "$ofile" + fi + + rmdir "$lockdir" +diff -Naur gtk+2.0-2.19.2.old/config.h.in gtk+2.0-2.19.2/config.h.in +--- gtk+2.0-2.19.2.old/config.h.in 2009-12-22 03:43:06.000000000 +0100 ++++ gtk+2.0-2.19.2/config.h.in 2010-01-04 10:42:27.536523633 +0100 @@ -126,6 +126,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H @@ -229,14 +131,14 @@ diff -Naur gtk+2.0-2.19.1.old/config.h.in gtk+2.0-2.19.1/config.h.in /* Define to the version of this package. */ #undef PACKAGE_VERSION -diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ---- gtk+2.0-2.19.1.old/configure 2009-11-30 22:17:39.000000000 +0100 -+++ gtk+2.0-2.19.1/configure 2009-12-01 16:03:31.444292874 +0100 +diff -Naur gtk+2.0-2.19.2.old/configure gtk+2.0-2.19.2/configure +--- gtk+2.0-2.19.2.old/configure 2009-12-22 03:42:41.000000000 +0100 ++++ gtk+2.0-2.19.2/configure 2010-01-04 10:42:26.672520593 +0100 @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for gtk+ 2.19.1. -+# Generated by GNU Autoconf 2.65 for gtk+ 2.19.1. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.19.2. ++# Generated by GNU Autoconf 2.65 for gtk+ 2.19.2. # # Report bugs to . # @@ -1042,8 +944,8 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Identity of this package. PACKAGE_NAME='gtk+' @@ -748,6 +705,7 @@ - PACKAGE_VERSION='2.19.1' - PACKAGE_STRING='gtk+ 2.19.1' + PACKAGE_VERSION='2.19.2' + PACKAGE_STRING='gtk+ 2.19.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B' +PACKAGE_URL='' @@ -1076,10 +978,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -GTKDOC_REBASE GTKDOC_CHECK +HTML_DIR - TEST_PRINT_BACKEND_FALSE - TEST_PRINT_BACKEND_TRUE - HAVE_PAPI_CUPS_FALSE -@@ -847,6 +798,7 @@ + HAVE_INTROSPECTION_FALSE + HAVE_INTROSPECTION_TRUE + INTROSPECTION_MAKEFILE +@@ -857,6 +808,7 @@ GDK_DEP_LIBS GDK_EXTRA_CFLAGS GDK_EXTRA_LIBS @@ -1087,7 +989,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure GDK_PACKAGES USE_DIRECTFB_FALSE USE_DIRECTFB_TRUE -@@ -1054,6 +1006,8 @@ +@@ -1065,6 +1017,8 @@ CXXFLAGS ac_ct_CXX CXX @@ -1096,7 +998,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -@@ -1151,6 +1105,7 @@ +@@ -1162,6 +1116,7 @@ program_transform_name prefix exec_prefix @@ -1104,8 +1006,8 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1195,8 +1150,6 @@ - enable_test_print_backend +@@ -1207,8 +1162,6 @@ + enable_introspection with_html_dir enable_gtk_doc -enable_gtk_doc_html @@ -1113,7 +1015,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enable_man with_xml_catalog ' -@@ -1331,8 +1284,7 @@ +@@ -1343,8 +1296,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1123,7 +1025,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1358,8 +1310,7 @@ +@@ -1370,8 +1322,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1133,7 +1035,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1563,8 +1514,7 @@ +@@ -1575,8 +1526,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1143,7 +1045,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1580,8 +1530,7 @@ +@@ -1592,8 +1542,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1153,7 +1055,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1611,17 +1560,17 @@ +@@ -1623,17 +1572,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -1177,7 +1079,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1638,15 +1587,13 @@ +@@ -1650,15 +1599,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -1195,7 +1097,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1669,8 +1616,7 @@ +@@ -1681,8 +1628,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -1205,7 +1107,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1700,11 +1646,9 @@ +@@ -1712,11 +1658,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -1219,7 +1121,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Find the source files, if location was not specified. -@@ -1743,13 +1687,11 @@ +@@ -1755,13 +1699,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -1235,10 +1137,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1892,9 +1834,7 @@ - - --enable-test-print-backend +@@ -1906,9 +1848,7 @@ build test print backend + --enable-introspection=[no/auto/yes] + Enable introspection for this build - --enable-gtk-doc use gtk-doc to build documentation [default=no] - --enable-gtk-doc-html build documentation in html format [default=yes] - --enable-gtk-doc-pdf build documentation in pdf format [default=no] @@ -1246,7 +1148,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure --enable-man regenerate man pages from Docbook [default=no] Optional Packages: -@@ -1924,7 +1864,7 @@ +@@ -1938,7 +1878,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l @@ -1255,10 +1157,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags -@@ -2014,464 +1954,973 @@ +@@ -2028,468 +1968,977 @@ if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.19.1 + gtk+ configure 2.19.2 -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.65 @@ -1274,7 +1176,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. --It was created by gtk+ $as_me 2.19.1, which was +-It was created by gtk+ $as_me 2.19.2, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## @@ -2110,7 +2012,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -+It was created by gtk+ $as_me 2.19.1, which was ++It was created by gtk+ $as_me 2.19.2, which was +generated by GNU Autoconf 2.65. Invocation command line was + $ $0 $@ @@ -2128,10 +2030,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` @@ -2319,10 +2221,6 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h -+$as_echo "/* confdefs.h */" > confdefs.h - -+# Predefined preprocessor variables. - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2331,6 +2229,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - - - ++$as_echo "/* confdefs.h */" > confdefs.h + ++# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF @@ -2438,6 +2340,8 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then +- if test $ac_prog = install && +- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 @@ -2538,6 +2442,8 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + + + ++ ++ +# Save this value here, since automake will set cflags later +cflags_set=${CFLAGS+set} + @@ -2604,10 +2510,12 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ if test $ac_prog = install && ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -2500,7 +2949,7 @@ + : + elif test $ac_prog = install && +@@ -2516,7 +2965,7 @@ ;; esac @@ -2616,7 +2524,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2516,7 +2965,7 @@ +@@ -2532,7 +2981,7 @@ INSTALL=$ac_install_sh fi fi @@ -2625,7 +2533,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2527,7 +2976,7 @@ +@@ -2543,7 +2992,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -2634,7 +2542,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2538,15 +2987,11 @@ +@@ -2554,15 +3003,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -2652,7 +2560,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -2568,11 +3013,8 @@ +@@ -2584,11 +3029,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -2666,7 +2574,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi test "$2" = conftest.file -@@ -2581,13 +3023,10 @@ +@@ -2597,13 +3039,10 @@ # Ok. : else @@ -2683,7 +2591,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2615,7 +3054,7 @@ +@@ -2631,7 +3070,7 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -2692,7 +2600,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2636,9 +3075,9 @@ +@@ -2652,9 +3091,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -2704,7 +2612,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -2649,24 +3088,24 @@ +@@ -2665,24 +3104,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2734,7 +2642,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -2676,9 +3115,9 @@ +@@ -2692,9 +3131,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -2746,7 +2654,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -2689,24 +3128,24 @@ +@@ -2705,24 +3144,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2776,7 +2684,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -2715,7 +3154,7 @@ +@@ -2731,7 +3170,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2785,7 +2693,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2728,10 +3167,10 @@ +@@ -2744,10 +3183,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" @@ -2798,7 +2706,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2739,7 +3178,7 @@ +@@ -2755,7 +3194,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2807,7 +2715,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -2751,11 +3190,12 @@ +@@ -2767,11 +3206,12 @@ esac done done @@ -2821,7 +2729,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else -@@ -2763,11 +3203,10 @@ +@@ -2779,11 +3219,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. @@ -2834,7 +2742,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2780,9 +3219,9 @@ +@@ -2796,9 +3235,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2846,7 +2754,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2793,24 +3232,24 @@ +@@ -2809,24 +3248,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2876,7 +2784,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -2818,11 +3257,11 @@ +@@ -2834,11 +3273,11 @@ test -n "$AWK" && break done @@ -2890,7 +2798,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2840,11 +3279,11 @@ +@@ -2856,11 +3295,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -2904,7 +2812,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2864,9 +3303,7 @@ +@@ -2880,9 +3319,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -2915,7 +2823,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi fi -@@ -2920,7 +3357,7 @@ +@@ -2936,7 +3373,7 @@ # by either passing --enable-silent-rules to configure or passing V=0 # to make # Check whether --enable-silent-rules was given. @@ -2924,7 +2832,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_silent_rules; fi -@@ -3009,35 +3446,27 @@ +@@ -3025,35 +3462,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2967,7 +2875,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -3053,28 +3482,24 @@ +@@ -3069,28 +3498,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -3001,7 +2909,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -3092,7 +3517,7 @@ +@@ -3108,7 +3533,7 @@ MATH_LIB=-lm @@ -3010,7 +2918,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for native Win32... " >&6; } LIB_EXE_MACHINE_FLAG=X86 case "$host" in -@@ -3110,7 +3535,7 @@ +@@ -3126,7 +3551,7 @@ os_win32=no ;; esac @@ -3019,7 +2927,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$os_win32" >&6; } -@@ -3129,9 +3554,9 @@ +@@ -3145,9 +3570,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -3031,7 +2939,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3142,24 +3567,24 @@ +@@ -3158,24 +3583,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3061,7 +2969,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3169,9 +3594,9 @@ +@@ -3185,9 +3610,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -3073,7 +2981,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3182,24 +3607,24 @@ +@@ -3198,24 +3623,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3103,7 +3011,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3208,7 +3633,7 @@ +@@ -3224,7 +3649,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3112,7 +3020,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3222,9 +3647,9 @@ +@@ -3238,9 +3663,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -3124,7 +3032,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3235,24 +3660,24 @@ +@@ -3251,24 +3676,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3154,7 +3062,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3262,9 +3687,9 @@ +@@ -3278,9 +3703,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -3166,7 +3074,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3276,18 +3701,18 @@ +@@ -3292,18 +3717,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3188,7 +3096,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3306,10 +3731,10 @@ +@@ -3322,10 +3747,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3201,7 +3109,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3321,9 +3746,9 @@ +@@ -3337,9 +3762,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -3213,7 +3121,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3334,24 +3759,24 @@ +@@ -3350,24 +3775,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3243,7 +3151,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3365,9 +3790,9 @@ +@@ -3381,9 +3806,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3255,7 +3163,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3378,24 +3803,24 @@ +@@ -3394,24 +3819,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3285,7 +3193,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -3408,7 +3833,7 @@ +@@ -3424,7 +3849,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3294,7 +3202,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3419,57 +3844,37 @@ +@@ -3435,57 +3860,37 @@ fi @@ -3372,7 +3280,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -3485,8 +3890,8 @@ +@@ -3501,8 +3906,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -3383,7 +3291,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: -@@ -3502,17 +3907,17 @@ +@@ -3518,17 +3923,17 @@ done rm -f $ac_rmfiles @@ -3406,7 +3314,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3529,7 +3934,7 @@ +@@ -3545,7 +3950,7 @@ # certainly right. break;; *.* ) @@ -3415,7 +3323,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3548,84 +3953,42 @@ +@@ -3564,84 +3969,42 @@ else ac_file='' fi @@ -3521,7 +3429,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3640,32 +4003,83 @@ +@@ -3656,91 +4019,134 @@ esac done else @@ -3547,19 +3455,31 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-$as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +- +#include -+int -+main () -+{ + int + main () + { +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF + + ; + return 0; + } + _ACEOF +-rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. @@ -3567,14 +3487,32 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in conftest.o conftest.obj conftest.*; do +- test -f "$ac_file" || continue; +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; +- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +- break;; +- esac +-done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' @@ -3594,72 +3532,68 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } --if test "${ac_cv_objext+set}" = set; then -+if test "${ac_cv_objext+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3677,17 +4091,17 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (ac_try="$ac_compile" -+if { { ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -@@ -3700,31 +4114,23 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } - fi -- ++fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 @@ -3683,7 +3617,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -3738,37 +4144,16 @@ +@@ -3754,37 +4160,16 @@ return 0; } _ACEOF @@ -3724,7 +3658,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3777,20 +4162,16 @@ +@@ -3793,20 +4178,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -3748,7 +3682,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -3801,35 +4182,11 @@ +@@ -3817,35 +4198,11 @@ return 0; } _ACEOF @@ -3787,7 +3721,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -3840,36 +4197,12 @@ +@@ -3856,36 +4213,12 @@ return 0; } _ACEOF @@ -3828,7 +3762,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -3880,42 +4213,17 @@ +@@ -3896,42 +4229,17 @@ return 0; } _ACEOF @@ -3873,7 +3807,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3932,18 +4240,14 @@ +@@ -3948,18 +4256,14 @@ CFLAGS= fi fi @@ -3895,7 +3829,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include #include -@@ -4000,32 +4304,9 @@ +@@ -4016,32 +4320,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3929,7 +3863,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -4036,17 +4317,19 @@ +@@ -4052,17 +4333,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3952,7 +3886,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -4065,7 +4348,7 @@ +@@ -4081,7 +4364,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -3961,7 +3895,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -4093,12 +4376,12 @@ +@@ -4109,12 +4392,12 @@ fi @@ -3976,7 +3910,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_dependency_tracking; fi -@@ -4118,9 +4401,9 @@ +@@ -4134,9 +4417,9 @@ depcc="$CC" am_compiler_list= @@ -3988,7 +3922,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4228,7 +4511,7 @@ +@@ -4244,7 +4527,7 @@ fi fi @@ -3997,7 +3931,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4244,7 +4527,7 @@ +@@ -4260,7 +4543,7 @@ # Check whether --enable-static was given. @@ -4006,7 +3940,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -4274,15 +4557,23 @@ +@@ -4290,15 +4573,23 @@ @@ -4032,7 +3966,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4293,24 +4584,24 @@ +@@ -4309,24 +4600,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4062,7 +3996,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -4324,9 +4615,9 @@ +@@ -4340,9 +4631,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4074,7 +4008,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4337,24 +4628,24 @@ +@@ -4353,24 +4644,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4104,7 +4038,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -4367,7 +4658,7 @@ +@@ -4383,7 +4674,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4113,7 +4047,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4397,9 +4688,9 @@ +@@ -4413,9 +4704,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4125,7 +4059,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4410,24 +4701,24 @@ +@@ -4426,24 +4717,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4155,7 +4089,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -4441,9 +4732,9 @@ +@@ -4457,9 +4748,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4167,7 +4101,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4454,24 +4745,24 @@ +@@ -4470,24 +4761,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4197,7 +4131,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -4484,7 +4775,7 @@ +@@ -4500,7 +4791,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4206,7 +4140,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4495,53 +4786,36 @@ +@@ -4511,53 +4802,36 @@ fi fi # Provide some information about the compiler. @@ -4279,7 +4213,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -4555,37 +4829,16 @@ +@@ -4571,37 +4845,16 @@ return 0; } _ACEOF @@ -4320,7 +4254,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -4594,20 +4847,16 @@ +@@ -4610,20 +4863,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -4344,7 +4278,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -4618,35 +4867,11 @@ +@@ -4634,35 +4883,11 @@ return 0; } _ACEOF @@ -4383,7 +4317,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -4657,36 +4882,12 @@ +@@ -4673,36 +4898,12 @@ return 0; } _ACEOF @@ -4424,7 +4358,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -4697,42 +4898,17 @@ +@@ -4713,42 +4914,17 @@ return 0; } _ACEOF @@ -4469,7 +4403,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -4757,9 +4933,9 @@ +@@ -4773,9 +4949,9 @@ depcc="$CXX" am_compiler_list= @@ -4481,7 +4415,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4867,7 +5043,7 @@ +@@ -4883,7 +5059,7 @@ fi fi @@ -4490,7 +4424,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -4883,11 +5059,7 @@ +@@ -4899,11 +5075,7 @@ @@ -4503,7 +4437,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -4898,32 +5070,11 @@ +@@ -4914,32 +5086,11 @@ return 0; } _ACEOF @@ -4539,7 +4473,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$CXX" != ""; then HAVE_CXX_TRUE= -@@ -4936,11 +5087,7 @@ +@@ -4952,11 +5103,7 @@ gtk_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -x objective-c++" @@ -4552,7 +4486,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ @interface Foo @end int -@@ -4951,32 +5098,11 @@ +@@ -4967,32 +5114,11 @@ return 0; } _ACEOF @@ -4587,7 +4521,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$OBJC" = "yes"; then HAVE_OBJC_TRUE= -@@ -4996,12 +5122,12 @@ +@@ -5012,12 +5138,12 @@ if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -4602,7 +4536,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} fi enable_shared=yes -@@ -5014,9 +5140,9 @@ +@@ -5030,9 +5156,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -4614,7 +4548,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$AS"; then -@@ -5027,24 +5153,24 @@ +@@ -5043,24 +5169,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4644,7 +4578,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5054,9 +5180,9 @@ +@@ -5070,9 +5196,9 @@ ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 @@ -4656,7 +4590,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then -@@ -5067,24 +5193,24 @@ +@@ -5083,24 +5209,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4686,7 +4620,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5093,7 +5219,7 @@ +@@ -5109,7 +5235,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4695,7 +4629,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5106,9 +5232,9 @@ +@@ -5122,9 +5248,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 @@ -4707,7 +4641,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then -@@ -5119,24 +5245,24 @@ +@@ -5135,24 +5261,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4737,7 +4671,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5146,9 +5272,9 @@ +@@ -5162,9 +5288,9 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 @@ -4749,7 +4683,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then -@@ -5159,24 +5285,24 @@ +@@ -5175,24 +5301,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4779,7 +4713,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5185,7 +5311,7 @@ +@@ -5201,7 +5327,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4788,7 +4722,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5198,9 +5324,9 @@ +@@ -5214,9 +5340,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -4800,7 +4734,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -5211,24 +5337,24 @@ +@@ -5227,24 +5353,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4830,7 +4764,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5238,9 +5364,9 @@ +@@ -5254,9 +5380,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -4842,7 +4776,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -5251,24 +5377,24 @@ +@@ -5267,24 +5393,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4872,7 +4806,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5277,7 +5403,7 @@ +@@ -5293,7 +5419,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4881,7 +4815,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5312,7 +5438,7 @@ +@@ -5328,7 +5454,7 @@ case `pwd` in *\ * | *\ *) @@ -4890,7 +4824,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -@@ -5335,9 +5461,9 @@ +@@ -5351,9 +5477,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -4902,7 +4836,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -5345,7 +5471,7 @@ +@@ -5361,7 +5487,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -4911,7 +4845,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -5354,7 +5480,7 @@ +@@ -5370,7 +5496,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4920,7 +4854,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -5374,7 +5500,7 @@ +@@ -5390,7 +5516,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4929,7 +4863,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -5389,19 +5515,17 @@ +@@ -5405,19 +5531,17 @@ $ac_path_SED_found && break 3 done done @@ -4952,7 +4886,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -5419,9 +5543,9 @@ +@@ -5435,9 +5559,9 @@ @@ -4964,7 +4898,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -5432,7 +5556,7 @@ +@@ -5448,7 +5572,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4973,7 +4907,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -5452,7 +5576,7 @@ +@@ -5468,7 +5592,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4982,7 +4916,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -5467,26 +5591,24 @@ +@@ -5483,26 +5607,24 @@ $ac_path_GREP_found && break 3 done done @@ -5014,7 +4948,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5500,7 +5622,7 @@ +@@ -5516,7 +5638,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5023,7 +4957,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -5520,7 +5642,7 @@ +@@ -5536,7 +5658,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5032,7 +4966,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -5535,12 +5657,10 @@ +@@ -5551,12 +5673,10 @@ $ac_path_EGREP_found && break 3 done done @@ -5047,7 +4981,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi else ac_cv_path_EGREP=$EGREP -@@ -5548,14 +5668,14 @@ +@@ -5564,14 +5684,14 @@ fi fi @@ -5065,7 +4999,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -5569,7 +5689,7 @@ +@@ -5585,7 +5705,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5074,7 +5008,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -5589,7 +5709,7 @@ +@@ -5605,7 +5725,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5083,7 +5017,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -5604,12 +5724,10 @@ +@@ -5620,12 +5740,10 @@ $ac_path_FGREP_found && break 3 done done @@ -5098,7 +5032,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi else ac_cv_path_FGREP=$FGREP -@@ -5617,7 +5735,7 @@ +@@ -5633,7 +5751,7 @@ fi fi @@ -5107,7 +5041,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -5643,7 +5761,7 @@ +@@ -5659,7 +5777,7 @@ # Check whether --with-gnu-ld was given. @@ -5116,7 +5050,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -5652,7 +5770,7 @@ +@@ -5668,7 +5786,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -5125,7 +5059,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -5682,13 +5800,13 @@ +@@ -5698,13 +5816,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -5142,7 +5076,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -5719,18 +5837,16 @@ +@@ -5735,18 +5853,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -5166,7 +5100,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -5743,7 +5859,7 @@ +@@ -5759,7 +5875,7 @@ ;; esac fi @@ -5175,7 +5109,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -5755,9 +5871,9 @@ +@@ -5771,9 +5887,9 @@ @@ -5187,7 +5121,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -5804,7 +5920,7 @@ +@@ -5820,7 +5936,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -5196,7 +5130,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -5815,9 +5931,9 @@ +@@ -5831,9 +5947,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5208,7 +5142,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -5828,24 +5944,24 @@ +@@ -5844,24 +5960,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5238,7 +5172,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5859,9 +5975,9 @@ +@@ -5875,9 +5991,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5250,7 +5184,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -5872,24 +5988,24 @@ +@@ -5888,24 +6004,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5280,7 +5214,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -5902,7 +6018,7 @@ +@@ -5918,7 +6034,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5289,7 +5223,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5922,44 +6038,44 @@ +@@ -5938,44 +6054,44 @@ @@ -5302,16 +5236,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5932: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6048: $ac_compile\"" >&5) +- (eval echo "\"\$as_me:5948: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6064: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:5935: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6051: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval echo "\"\$as_me:5951: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6067: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:5938: output\"" >&5) -+ (eval echo "\"\$as_me:6054: output\"" >&5) +- (eval echo "\"\$as_me:5954: output\"" >&5) ++ (eval echo "\"\$as_me:6070: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5345,7 +5279,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6077,10 +6193,10 @@ +@@ -6093,10 +6209,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5358,7 +5292,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6094,7 +6210,7 @@ +@@ -6110,7 +6226,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5367,7 +5301,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6104,17 +6220,17 @@ +@@ -6120,17 +6236,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5388,7 +5322,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_shell_append" >&6; } -@@ -6149,14 +6265,14 @@ +@@ -6165,14 +6281,14 @@ @@ -5406,7 +5340,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6185,9 +6301,9 @@ +@@ -6201,9 +6317,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -5418,7 +5352,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6198,24 +6314,24 @@ +@@ -6214,24 +6330,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5448,7 +5382,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6225,9 +6341,9 @@ +@@ -6241,9 +6357,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -5460,7 +5394,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6238,24 +6354,24 @@ +@@ -6254,24 +6370,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5490,7 +5424,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6264,7 +6380,7 @@ +@@ -6280,7 +6396,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5499,7 +5433,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6281,9 +6397,9 @@ +@@ -6297,9 +6413,9 @@ @@ -5511,7 +5445,12 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -6402,7 +6518,7 @@ +@@ -6414,11 +6530,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5520,7 +5459,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure 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 -@@ -6477,7 +6593,7 @@ +@@ -6493,7 +6609,7 @@ esac fi @@ -5529,7 +5468,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -6497,9 +6613,9 @@ +@@ -6513,9 +6629,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5541,7 +5480,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -6510,24 +6626,24 @@ +@@ -6526,24 +6642,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5571,7 +5510,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6537,9 +6653,9 @@ +@@ -6553,9 +6669,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -5583,7 +5522,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -6550,24 +6666,24 @@ +@@ -6566,24 +6682,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5613,7 +5552,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6576,7 +6692,7 @@ +@@ -6592,7 +6708,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5622,7 +5561,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6602,9 +6718,9 @@ +@@ -6618,9 +6734,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5634,7 +5573,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -6615,24 +6731,24 @@ +@@ -6631,24 +6747,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5664,7 +5603,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6642,9 +6758,9 @@ +@@ -6658,9 +6774,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5676,7 +5615,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -6655,24 +6771,24 @@ +@@ -6671,24 +6787,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5706,7 +5645,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6681,7 +6797,7 @@ +@@ -6697,7 +6813,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5715,7 +5654,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6701,9 +6817,9 @@ +@@ -6717,9 +6833,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -5727,7 +5666,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -6714,24 +6830,24 @@ +@@ -6730,24 +6846,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5757,7 +5696,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6741,9 +6857,9 @@ +@@ -6757,9 +6873,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -5769,7 +5708,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -6754,24 +6870,24 @@ +@@ -6770,24 +6886,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5799,7 +5738,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -6780,7 +6896,7 @@ +@@ -6796,7 +6912,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5808,7 +5747,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6858,9 +6974,9 @@ +@@ -6874,9 +6990,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -5820,7 +5759,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else -@@ -6976,18 +7092,18 @@ +@@ -6992,18 +7108,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -5845,7 +5784,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7040,11 +7156,11 @@ +@@ -7056,11 +7172,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -5860,7 +5799,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7078,10 +7194,10 @@ +@@ -7094,10 +7210,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -5873,7 +5812,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "ok" >&6; } fi -@@ -7108,7 +7224,7 @@ +@@ -7124,7 +7240,7 @@ # Check whether --enable-libtool-lock was given. @@ -5882,7 +5821,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_libtool_lock; fi -@@ -7120,11 +7236,11 @@ +@@ -7136,11 +7252,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5897,13 +5836,13 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7138,12 +7254,12 @@ +@@ -7154,12 +7270,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7141 "configure"' > conftest.$ac_ext +- echo '#line 7157 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7257 "configure"' > conftest.$ac_ext ++ echo '#line 7273 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5914,7 +5853,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7177,11 +7293,11 @@ +@@ -7193,11 +7309,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5929,7 +5868,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7230,9 +7346,9 @@ +@@ -7246,9 +7362,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -5941,7 +5880,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7241,11 +7357,7 @@ +@@ -7257,11 +7373,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -5954,7 +5893,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -7256,38 +7368,13 @@ +@@ -7272,38 +7384,13 @@ return 0; } _ACEOF @@ -5997,7 +5936,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7295,7 +7382,7 @@ +@@ -7311,7 +7398,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -6006,7 +5945,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7305,11 +7392,11 @@ +@@ -7321,11 +7408,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6021,7 +5960,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -7335,9 +7422,9 @@ +@@ -7351,9 +7438,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -6033,7 +5972,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -7348,24 +7435,24 @@ +@@ -7364,24 +7451,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6063,7 +6002,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7375,9 +7462,9 @@ +@@ -7391,9 +7478,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -6075,7 +6014,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -7388,24 +7475,24 @@ +@@ -7404,24 +7491,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6105,7 +6044,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7414,7 +7501,7 @@ +@@ -7430,7 +7517,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6114,7 +6053,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7427,9 +7514,9 @@ +@@ -7443,9 +7530,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -6126,7 +6065,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -7440,24 +7527,24 @@ +@@ -7456,24 +7543,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6156,7 +6095,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7467,9 +7554,9 @@ +@@ -7483,9 +7570,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -6168,7 +6107,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -7480,24 +7567,24 @@ +@@ -7496,24 +7583,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6198,7 +6137,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7506,7 +7593,7 @@ +@@ -7522,7 +7609,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6207,7 +6146,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7519,9 +7606,9 @@ +@@ -7535,9 +7622,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 @@ -6219,7 +6158,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -7532,24 +7619,24 @@ +@@ -7548,24 +7635,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6249,7 +6188,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7559,9 +7646,9 @@ +@@ -7575,9 +7662,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 @@ -6261,7 +6200,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -7572,24 +7659,24 @@ +@@ -7588,24 +7675,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6291,7 +6230,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7598,7 +7685,7 @@ +@@ -7614,7 +7701,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6300,7 +6239,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7611,9 +7698,9 @@ +@@ -7627,9 +7714,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 @@ -6312,7 +6251,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -7624,24 +7711,24 @@ +@@ -7640,24 +7727,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6342,7 +6281,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7651,9 +7738,9 @@ +@@ -7667,9 +7754,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 @@ -6354,7 +6293,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -7664,24 +7751,24 @@ +@@ -7680,24 +7767,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6384,7 +6323,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7690,7 +7777,7 @@ +@@ -7706,7 +7793,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6393,7 +6332,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7703,9 +7790,9 @@ +@@ -7719,9 +7806,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 @@ -6405,7 +6344,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -7716,24 +7803,24 @@ +@@ -7732,24 +7819,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6435,7 +6374,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7743,9 +7830,9 @@ +@@ -7759,9 +7846,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 @@ -6447,7 +6386,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -7756,24 +7843,24 @@ +@@ -7772,24 +7859,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6477,7 +6416,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -7782,7 +7869,7 @@ +@@ -7798,7 +7885,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6486,7 +6425,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7818,9 +7905,9 @@ +@@ -7834,9 +7921,9 @@ @@ -6498,7 +6437,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -7845,22 +7932,18 @@ +@@ -7861,22 +7948,18 @@ rm -f conftest.* fi fi @@ -6525,7 +6464,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -7871,42 +7954,17 @@ +@@ -7887,42 +7970,17 @@ return 0; } _ACEOF @@ -6573,7 +6512,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -7948,14 +8006,14 @@ +@@ -7964,14 +8022,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6590,7 +6529,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -7970,11 +8028,7 @@ +@@ -7986,11 +8044,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6603,7 +6542,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -7983,78 +8037,34 @@ +@@ -7999,78 +8053,34 @@ #endif Syntax error _ACEOF @@ -6687,7 +6626,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure break fi -@@ -8066,7 +8076,7 @@ +@@ -8082,7 +8092,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -6696,7 +6635,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -8077,11 +8087,7 @@ +@@ -8093,11 +8103,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6709,7 +6648,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -8090,87 +8096,40 @@ +@@ -8106,87 +8112,40 @@ #endif Syntax error _ACEOF @@ -6806,7 +6745,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi ac_ext=c -@@ -8180,16 +8139,12 @@ +@@ -8196,16 +8155,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6826,7 +6765,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include #include -@@ -8204,48 +8159,23 @@ +@@ -8220,48 +8175,23 @@ return 0; } _ACEOF @@ -6880,7 +6819,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else ac_cv_header_stdc=no fi -@@ -8255,18 +8185,14 @@ +@@ -8271,18 +8201,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -6902,7 +6841,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else ac_cv_header_stdc=no fi -@@ -8276,14 +8202,10 @@ +@@ -8292,14 +8218,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -6919,7 +6858,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include #include -@@ -8310,118 +8232,34 @@ +@@ -8326,118 +8248,34 @@ return 0; } _ACEOF @@ -7051,7 +6990,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -8431,62 +8269,13 @@ +@@ -8447,62 +8285,13 @@ done @@ -7119,7 +7058,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure _ACEOF fi -@@ -8509,9 +8298,9 @@ +@@ -8525,9 +8314,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -7131,7 +7070,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -8522,24 +8311,24 @@ +@@ -8538,24 +8327,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -7161,7 +7100,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -8553,9 +8342,9 @@ +@@ -8569,9 +8358,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7173,7 +7112,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -8566,24 +8355,24 @@ +@@ -8582,24 +8371,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -7203,7 +7142,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -8596,7 +8385,7 @@ +@@ -8612,7 +8401,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -7212,7 +7151,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8607,53 +8396,36 @@ +@@ -8623,53 +8412,36 @@ fi fi # Provide some information about the compiler. @@ -7221,14 +7160,19 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 -- ac_status=$? ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" @@ -7243,19 +7187,14 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? +- ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then @@ -7285,7 +7224,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -8667,37 +8439,16 @@ +@@ -8683,37 +8455,16 @@ return 0; } _ACEOF @@ -7326,7 +7265,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -8706,20 +8457,16 @@ +@@ -8722,20 +8473,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -7350,7 +7289,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -8730,35 +8477,11 @@ +@@ -8746,35 +8493,11 @@ return 0; } _ACEOF @@ -7389,7 +7328,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -8769,36 +8492,12 @@ +@@ -8785,36 +8508,12 @@ return 0; } _ACEOF @@ -7430,7 +7369,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -8809,42 +8508,17 @@ +@@ -8825,42 +8524,17 @@ return 0; } _ACEOF @@ -7475,7 +7414,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -8869,9 +8543,9 @@ +@@ -8885,9 +8559,9 @@ depcc="$CXX" am_compiler_list= @@ -7487,7 +7426,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -8979,7 +8653,7 @@ +@@ -8995,7 +8669,7 @@ fi fi @@ -7496,7 +7435,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -9002,10 +8676,10 @@ +@@ -9018,10 +8692,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -7509,7 +7448,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded -@@ -9020,11 +8694,7 @@ +@@ -9036,11 +8710,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -7522,7 +7461,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9033,78 +8703,34 @@ +@@ -9049,78 +8719,34 @@ #endif Syntax error _ACEOF @@ -7606,7 +7545,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure break fi -@@ -9116,7 +8742,7 @@ +@@ -9132,7 +8758,7 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -7615,7 +7554,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes -@@ -9127,11 +8753,7 @@ +@@ -9143,11 +8769,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -7628,7 +7567,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9140,81 +8762,37 @@ +@@ -9156,81 +8778,37 @@ #endif Syntax error _ACEOF @@ -7717,7 +7656,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} _lt_caught_CXX_error=yes; } fi -@@ -9241,7 +8819,7 @@ +@@ -9257,7 +8835,7 @@ # Check whether --enable-shared was given. @@ -7726,7 +7665,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -9274,7 +8852,7 @@ +@@ -9290,7 +8868,7 @@ # Check whether --with-pic was given. @@ -7735,7 +7674,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -9290,7 +8868,7 @@ +@@ -9306,7 +8884,7 @@ # Check whether --enable-fast-install was given. @@ -7744,7 +7683,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -9371,9 +8949,9 @@ +@@ -9387,9 +8965,9 @@ setopt NO_GLOB_SUBST fi @@ -7756,7 +7695,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -9386,7 +8964,7 @@ +@@ -9402,7 +8980,7 @@ fi rmdir .libs 2>/dev/null fi @@ -7765,7 +7704,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -9479,9 +9057,9 @@ +@@ -9495,9 +9073,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -7777,7 +7716,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9532,10 +9110,10 @@ +@@ -9548,10 +9126,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7790,7 +7729,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -9545,9 +9123,9 @@ +@@ -9561,9 +9139,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -7802,7 +7741,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9598,10 +9176,10 @@ +@@ -9614,10 +9192,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7815,7 +7754,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -9678,9 +9256,9 @@ +@@ -9698,9 +9276,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -7827,21 +7766,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9696,11 +9274,11 @@ +@@ -9716,11 +9294,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:9699: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9277: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9297: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9703: \$? = $ac_status" >&5 -+ echo "$as_me:9281: \$? = $ac_status" >&5 +- echo "$as_me:9723: \$? = $ac_status" >&5 ++ echo "$as_me:9301: \$? = $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. -@@ -9713,7 +9291,7 @@ +@@ -9733,7 +9311,7 @@ $RM conftest* fi @@ -7850,7 +7789,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9733,7 +9311,7 @@ +@@ -9753,7 +9331,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -7859,7 +7798,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -10005,7 +9583,7 @@ +@@ -9885,7 +9463,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -10025,7 +9603,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -7868,7 +7816,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -10017,9 +9595,9 @@ +@@ -10037,9 +9615,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -7880,21 +7828,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -10035,11 +9613,11 @@ +@@ -10055,11 +9633,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:10038: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9616: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9636: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:10042: \$? = $ac_status" >&5 -+ echo "$as_me:9620: \$? = $ac_status" >&5 +- echo "$as_me:10062: \$? = $ac_status" >&5 ++ echo "$as_me:9640: \$? = $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. -@@ -10052,7 +9630,7 @@ +@@ -10072,7 +9650,7 @@ $RM conftest* fi @@ -7903,7 +7851,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -10076,9 +9654,9 @@ +@@ -10096,9 +9674,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -7915,7 +7863,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -10104,7 +9682,7 @@ +@@ -10124,7 +9702,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -7924,7 +7872,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -10119,9 +9697,9 @@ +@@ -10139,9 +9717,9 @@ @@ -7936,21 +7884,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10140,11 +9718,11 @@ +@@ -10160,11 +9738,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:10143: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9721: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10163: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9741: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10147: \$? = $ac_status" >&5 -+ echo "$as_me:9725: \$? = $ac_status" >&5 +- echo "$as_me:10167: \$? = $ac_status" >&5 ++ echo "$as_me:9745: \$? = $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 -@@ -10166,7 +9744,7 @@ +@@ -10186,7 +9764,7 @@ $RM conftest* fi @@ -7959,7 +7907,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10174,9 +9752,9 @@ +@@ -10194,9 +9772,9 @@ @@ -7971,21 +7919,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10195,11 +9773,11 @@ +@@ -10215,11 +9793,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:10198: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9776: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10218: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9796: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10202: \$? = $ac_status" >&5 -+ echo "$as_me:9780: \$? = $ac_status" >&5 +- echo "$as_me:10222: \$? = $ac_status" >&5 ++ echo "$as_me:9800: \$? = $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 -@@ -10221,7 +9799,7 @@ +@@ -10241,7 +9819,7 @@ $RM conftest* fi @@ -7994,7 +7942,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10230,7 +9808,7 @@ +@@ -10250,7 +9828,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -8003,7 +7951,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -10238,10 +9816,10 @@ +@@ -10258,10 +9836,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -8016,7 +7964,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -10254,7 +9832,7 @@ +@@ -10274,7 +9852,7 @@ @@ -8025,7 +7973,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -10314,6 +9892,9 @@ +@@ -10334,6 +9912,9 @@ openbsd*) with_gnu_ld=no ;; @@ -8035,7 +7983,24 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac ld_shlibs=yes -@@ -10496,7 +10077,7 @@ +@@ -10355,6 +9936,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -10446,7 +10028,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -10516,7 +10098,7 @@ fi ;; @@ -8044,7 +8009,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10671,6 +10252,7 @@ +@@ -10691,6 +10273,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -8052,7 +8017,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10696,11 +10278,7 @@ +@@ -10716,11 +10299,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8065,7 +8030,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -10711,27 +10289,7 @@ +@@ -10731,27 +10310,7 @@ return 0; } _ACEOF @@ -8094,7 +8059,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10745,16 +10303,9 @@ +@@ -10765,16 +10324,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -8113,7 +8078,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10767,11 +10318,7 @@ +@@ -10787,11 +10339,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -8126,7 +8091,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -10782,27 +10329,7 @@ +@@ -10802,27 +10350,7 @@ return 0; } _ACEOF @@ -8155,7 +8120,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10816,16 +10343,9 @@ +@@ -10836,16 +10364,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -8174,7 +8139,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -11037,42 +10557,16 @@ +@@ -11057,42 +10578,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -8222,7 +8187,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -11085,7 +10579,7 @@ +@@ -11105,7 +10600,7 @@ link_all_deplibs=yes ;; @@ -8231,7 +8196,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -11328,7 +10822,7 @@ +@@ -11348,7 +10843,7 @@ fi fi @@ -8240,7 +8205,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -11365,16 +10859,16 @@ +@@ -11385,16 +10880,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -8261,7 +8226,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -11388,11 +10882,11 @@ +@@ -11408,11 +10903,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -8276,7 +8241,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure then archive_cmds_need_lc=no else -@@ -11403,7 +10897,7 @@ +@@ -11423,7 +10918,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -8285,7 +8250,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -11567,7 +11061,7 @@ +@@ -11587,7 +11082,7 @@ @@ -8294,7 +8259,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11989,11 +11483,7 @@ +@@ -11995,7 +11490,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12009,11 +11504,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -8307,7 +8281,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -12004,41 +11494,13 @@ +@@ -12024,41 +11515,13 @@ return 0; } _ACEOF @@ -8353,7 +8327,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -12047,13 +11509,10 @@ +@@ -12067,13 +11530,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -8368,7 +8342,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12065,6 +11524,18 @@ +@@ -12085,6 +11545,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -8387,7 +8361,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -12253,7 +11724,7 @@ +@@ -12273,7 +11745,7 @@ dynamic_linker=no ;; esac @@ -8396,7 +8370,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -12355,7 +11826,7 @@ +@@ -12375,7 +11847,7 @@ @@ -8405,7 +8379,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -12380,7 +11851,7 @@ +@@ -12400,7 +11872,7 @@ # directories. hardcode_action=unsupported fi @@ -8414,7 +8388,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -12425,18 +11896,14 @@ +@@ -12445,18 +11917,14 @@ darwin*) # if libdl is installed we need to link against it @@ -8436,7 +8410,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12454,43 +11921,18 @@ +@@ -12474,43 +11942,18 @@ return 0; } _ACEOF @@ -8486,7 +8460,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -12503,33 +11945,19 @@ +@@ -12523,33 +11966,19 @@ ;; *) @@ -8530,7 +8504,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -12538,13 +11966,6 @@ +@@ -12558,13 +11987,6 @@ extern "C" #endif char shl_load (); @@ -8544,7 +8518,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure int main () { -@@ -12553,56 +11974,32 @@ +@@ -12573,212 +11995,32 @@ return 0; } _ACEOF @@ -8570,71 +8544,51 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dld_shl_load=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -+ ac_cv_lib_dld_shl_load=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else +-else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-ldl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12611,222 +12008,37 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char shl_load (); -+char dlopen (); - int - main () - { +-int +-main () +-{ -return shl_load (); -+return dlopen (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8656,26 +8610,30 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_dld_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dl_dlopen=yes + ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no --fi ++ ac_cv_lib_dld_shl_load=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" --else ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then @@ -8762,37 +8720,32 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" --else ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" + else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12796,57 +12038,28 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8814,8 +8767,9 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_dl_dlopen=yes --else ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -8855,7 +8809,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12844,57 +12056,28 @@ +@@ -12864,57 +12077,28 @@ return 0; } _ACEOF @@ -8922,7 +8876,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12912,43 +12095,18 @@ +@@ -12932,43 +12116,18 @@ return 0; } _ACEOF @@ -8972,7 +8926,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12987,9 +12145,9 @@ +@@ -13007,9 +12166,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8984,16 +8938,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12998,7 +12156,7 @@ +@@ -13018,7 +12177,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 13001 "configure" -+#line 12159 "configure" +-#line 13021 "configure" ++#line 12180 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13057,11 +12215,11 @@ +@@ -13077,11 +12236,11 @@ return status; } _LT_EOF @@ -9008,7 +8962,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13078,14 +12236,14 @@ +@@ -13098,14 +12257,14 @@ fi @@ -9026,16 +8980,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13094,7 +12252,7 @@ +@@ -13114,7 +12273,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 13097 "configure" -+#line 12255 "configure" +-#line 13117 "configure" ++#line 12276 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13153,11 +12311,11 @@ +@@ -13173,11 +12332,11 @@ return status; } _LT_EOF @@ -9050,7 +9004,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13174,7 +12332,7 @@ +@@ -13194,7 +12353,7 @@ fi @@ -9059,7 +9013,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -13213,12 +12371,12 @@ +@@ -13233,12 +12392,12 @@ striplib= old_striplib= @@ -9074,7 +9028,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -13227,15 +12385,15 @@ +@@ -13247,15 +12406,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -9093,7 +9047,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } ;; esac -@@ -13253,12 +12411,12 @@ +@@ -13273,12 +12432,12 @@ # Report which library types will actually be built @@ -9109,7 +9063,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -13279,14 +12437,14 @@ +@@ -13299,14 +12458,14 @@ fi ;; esac @@ -9127,7 +9081,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$enable_static" >&6; } -@@ -13427,7 +12585,7 @@ +@@ -13447,7 +12606,7 @@ # Check whether --with-gnu-ld was given. @@ -9136,7 +9090,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -13436,7 +12594,7 @@ +@@ -13456,7 +12615,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -9145,7 +9099,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -13466,13 +12624,13 @@ +@@ -13486,13 +12645,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -9162,7 +9116,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -13503,18 +12661,16 @@ +@@ -13523,18 +12682,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -9186,7 +9140,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -13527,7 +12683,7 @@ +@@ -13547,7 +12704,7 @@ ;; esac fi @@ -9195,7 +9149,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -13582,7 +12738,7 @@ +@@ -13602,7 +12759,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics @@ -9204,7 +9158,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in -@@ -13683,11 +12839,7 @@ +@@ -13703,11 +12860,7 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9217,7 +9171,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -13698,27 +12850,7 @@ +@@ -13718,27 +12871,7 @@ return 0; } _ACEOF @@ -9246,7 +9200,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13732,16 +12864,9 @@ +@@ -13752,16 +12885,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -9265,7 +9219,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -13755,11 +12880,7 @@ +@@ -13775,11 +12901,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -9278,7 +9232,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -13770,27 +12891,7 @@ +@@ -13790,27 +12912,7 @@ return 0; } _ACEOF @@ -9307,7 +9261,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13804,16 +12905,9 @@ +@@ -13824,16 +12926,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -9326,7 +9280,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -14557,7 +13651,7 @@ +@@ -14118,7 +13213,7 @@ + inherit_rpath_CXX=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -14577,7 +13672,7 @@ ;; esac @@ -9335,7 +9298,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -14585,11 +13679,11 @@ +@@ -14605,11 +13700,11 @@ }; _LT_EOF @@ -9350,7 +9313,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -14770,7 +13864,7 @@ +@@ -14790,7 +13885,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9359,7 +9322,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. -@@ -14990,7 +14084,7 @@ +@@ -14946,7 +14041,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -15010,7 +14105,7 @@ ;; esac ;; @@ -9368,7 +9340,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -15087,7 +14181,7 @@ +@@ -15107,7 +14202,7 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9377,7 +9349,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_prog_compiler_pic_CXX" >&6; } -@@ -15096,9 +14190,9 @@ +@@ -15116,9 +14211,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then @@ -9389,21 +9361,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no -@@ -15114,11 +14208,11 @@ +@@ -15134,11 +14229,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:15117: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14211: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15137: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14232: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:15121: \$? = $ac_status" >&5 -+ echo "$as_me:14215: \$? = $ac_status" >&5 +- echo "$as_me:15141: \$? = $ac_status" >&5 ++ echo "$as_me:14236: \$? = $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. -@@ -15131,7 +14225,7 @@ +@@ -15151,7 +14246,7 @@ $RM conftest* fi @@ -9412,7 +9384,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -@@ -15152,9 +14246,9 @@ +@@ -15172,9 +14267,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" @@ -9424,7 +9396,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no -@@ -15180,7 +14274,7 @@ +@@ -15200,7 +14295,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -9433,7 +9405,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -@@ -15192,9 +14286,9 @@ +@@ -15212,9 +14307,9 @@ @@ -9445,21 +9417,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15213,11 +14307,11 @@ +@@ -15233,11 +14328,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:15216: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14310: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15236: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14331: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15220: \$? = $ac_status" >&5 -+ echo "$as_me:14314: \$? = $ac_status" >&5 +- echo "$as_me:15240: \$? = $ac_status" >&5 ++ echo "$as_me:14335: \$? = $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 -@@ -15239,14 +14333,14 @@ +@@ -15259,14 +14354,14 @@ $RM conftest* fi @@ -9477,21 +9449,21 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15265,11 +14359,11 @@ +@@ -15285,11 +14380,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:15268: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14362: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15288: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14383: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15272: \$? = $ac_status" >&5 -+ echo "$as_me:14366: \$? = $ac_status" >&5 +- echo "$as_me:15292: \$? = $ac_status" >&5 ++ echo "$as_me:14387: \$? = $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 -@@ -15291,7 +14385,7 @@ +@@ -15311,7 +14406,7 @@ $RM conftest* fi @@ -9500,7 +9472,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -@@ -15300,7 +14394,7 @@ +@@ -15320,7 +14415,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -9509,7 +9481,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -15308,10 +14402,10 @@ +@@ -15328,10 +14423,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -9522,7 +9494,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -15321,7 +14415,7 @@ +@@ -15341,7 +14436,7 @@ @@ -9531,7 +9503,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -@@ -15341,13 +14435,16 @@ +@@ -15361,13 +14456,16 @@ cygwin* | mingw* | cegcc*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -9549,7 +9521,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -15375,16 +14472,16 @@ +@@ -15395,16 +14493,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -9570,7 +9542,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -15398,11 +14495,11 @@ +@@ -15418,11 +14516,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= @@ -9585,7 +9557,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure then archive_cmds_need_lc_CXX=no else -@@ -15413,7 +14510,7 @@ +@@ -15433,7 +14531,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -9594,7 +9566,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac -@@ -15484,7 +14581,7 @@ +@@ -15504,7 +14602,7 @@ @@ -9603,7 +9575,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= -@@ -15854,11 +14951,7 @@ +@@ -15860,7 +14958,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15874,11 +14972,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" @@ -9616,7 +9597,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -15869,41 +14962,13 @@ +@@ -15889,41 +14983,13 @@ return 0; } _ACEOF @@ -9662,7 +9643,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -15912,13 +14977,10 @@ +@@ -15932,13 +14998,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -9677,7 +9658,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -15930,6 +14992,18 @@ +@@ -15950,6 +15013,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -9696,7 +9677,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -16118,7 +15192,7 @@ +@@ -16138,7 +15213,7 @@ dynamic_linker=no ;; esac @@ -9705,7 +9686,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -16169,7 +15243,7 @@ +@@ -16189,7 +15264,7 @@ @@ -9714,7 +9695,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || -@@ -16194,7 +15268,7 @@ +@@ -16214,7 +15289,7 @@ # directories. hardcode_action_CXX=unsupported fi @@ -9723,7 +9704,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || -@@ -16253,7 +15327,7 @@ +@@ -16273,7 +15348,7 @@ : ${CONFIG_LT=./config.lt} @@ -9732,7 +9713,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: creating $CONFIG_LT" >&6;} cat >"$CONFIG_LT" <<_LTEOF #! $SHELL -@@ -16265,13 +15339,13 @@ +@@ -16285,13 +15360,13 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -9750,7 +9731,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -16279,23 +15353,15 @@ +@@ -16299,23 +15374,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -9779,7 +9760,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure as_nl=' ' export as_nl -@@ -16303,7 +15369,13 @@ +@@ -16323,7 +15390,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -9794,7 +9775,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -16314,7 +15386,7 @@ +@@ -16334,7 +15407,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -9803,7 +9784,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -16337,13 +15409,6 @@ +@@ -16357,13 +15430,6 @@ } fi @@ -9817,7 +9798,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -16353,15 +15418,15 @@ +@@ -16373,15 +15439,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -9836,7 +9817,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -16373,12 +15438,16 @@ +@@ -16393,12 +15459,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -9857,16 +9838,28 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure done PS1='$ ' PS2='> ' -@@ -16390,7 +15459,90 @@ +@@ -16410,22 +15480,109 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+ + +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi + + +-# Name of the executable. +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are @@ -9946,24 +9939,29 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +fi # as_fn_arith + + - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -16404,8 +15556,12 @@ - as_basename=false - fi - ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi - --# Name of the executable. ++ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -16425,77 +15581,25 @@ +@@ -16445,77 +15602,25 @@ } s/.*/./; q'` @@ -10052,7 +10050,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -16524,8 +15628,56 @@ +@@ -16544,8 +15649,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10110,7 +10108,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -16544,10 +15696,10 @@ +@@ -16564,10 +15717,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -10123,16 +10121,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -16587,7 +15739,7 @@ +@@ -16607,7 +15760,7 @@ lt_cl_version="\ - gtk+ config.lt 2.19.1 + gtk+ config.lt 2.19.2 -configured by $0, generated by GNU Autoconf 2.63. +configured by $0, generated by GNU Autoconf 2.65. Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation -@@ -16605,17 +15757,11 @@ +@@ -16625,17 +15778,11 @@ --quiet | --q* | --silent | --s* | -q ) lt_cl_silent=: ;; @@ -10155,7 +10153,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac shift done -@@ -16981,7 +16127,7 @@ +@@ -17001,7 +16148,7 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -10164,7 +10162,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: creating $ofile" >&6;} -@@ -17791,7 +16937,7 @@ +@@ -17811,7 +16958,7 @@ _LT_EOF @@ -10173,7 +10171,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure _LTEOF chmod +x "$CONFIG_LT" -@@ -17806,22 +16952,22 @@ +@@ -17826,22 +16973,22 @@ exec 5>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false exec 5>>config.log @@ -10200,7 +10198,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no -@@ -17830,11 +16976,7 @@ +@@ -17850,11 +16997,7 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. @@ -10213,7 +10211,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17853,60 +16995,14 @@ +@@ -17873,60 +17016,14 @@ return 0; } _ACEOF @@ -10276,7 +10274,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -17914,23 +17010,19 @@ +@@ -17934,23 +17031,19 @@ rm -f conftest.$ac_ext fi fi @@ -10304,7 +10302,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17949,38 +17041,11 @@ +@@ -17969,38 +17062,11 @@ return 0; } _ACEOF @@ -10345,7 +10343,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include -@@ -18000,38 +17065,15 @@ +@@ -18020,38 +17086,15 @@ return 0; } _ACEOF @@ -10386,7 +10384,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -18043,17 +17085,13 @@ +@@ -18063,17 +17106,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -10407,7 +10405,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -18072,38 +17110,11 @@ +@@ -18092,38 +17131,11 @@ return 0; } _ACEOF @@ -10448,7 +10446,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include -@@ -18123,38 +17134,15 @@ +@@ -18143,38 +17155,15 @@ return 0; } _ACEOF @@ -10489,7 +10487,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -18178,9 +17166,9 @@ +@@ -18198,9 +17187,9 @@ depcc="$CCAS" am_compiler_list= @@ -10501,7 +10499,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -18286,7 +17274,7 @@ +@@ -18306,7 +17295,7 @@ fi fi @@ -10510,7 +10508,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -@@ -18303,9 +17291,9 @@ +@@ -18323,9 +17312,9 @@ # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 @@ -10522,7 +10520,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $NM in -@@ -18318,14 +17306,14 @@ +@@ -18338,14 +17327,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10540,7 +10538,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -@@ -18334,26 +17322,26 @@ +@@ -18354,26 +17343,26 @@ fi NM=$ac_cv_path_NM if test -n "$NM"; then @@ -10572,7 +10570,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= -@@ -18367,7 +17355,7 @@ +@@ -18387,7 +17376,7 @@ @@ -10581,7 +10579,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for some Win32 platform... " >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) -@@ -18377,7 +17365,7 @@ +@@ -18397,7 +17386,7 @@ platform_win32=no ;; esac @@ -10590,7 +10588,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$platform_win32" >&6; } if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= -@@ -18417,9 +17405,9 @@ +@@ -18437,9 +17426,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 @@ -10602,7 +10600,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$WINDRES"; then -@@ -18430,24 +17418,24 @@ +@@ -18450,24 +17439,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10632,7 +10630,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18457,9 +17445,9 @@ +@@ -18477,9 +17466,9 @@ ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 @@ -10644,7 +10642,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_WINDRES"; then -@@ -18470,24 +17458,24 @@ +@@ -18490,24 +17479,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10674,7 +10672,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18496,7 +17484,7 @@ +@@ -18516,7 +17505,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -10683,7 +10681,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18507,15 +17495,13 @@ +@@ -18527,15 +17516,13 @@ fi if test "$WINDRES" = no; then @@ -10702,7 +10700,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ms_librarian"; then -@@ -18526,14 +17512,14 @@ +@@ -18546,14 +17533,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10720,7 +10718,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" -@@ -18541,10 +17527,10 @@ +@@ -18561,10 +17548,10 @@ fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -10733,7 +10731,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18562,42 +17548,42 @@ +@@ -18582,42 +17569,42 @@ # Check whether --enable-debug was given. @@ -10782,7 +10780,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_visibility; else enable_visibility=yes -@@ -18606,7 +17592,7 @@ +@@ -18626,7 +17613,7 @@ # Check whether --with-xinput was given. @@ -10791,7 +10789,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_xinput; fi -@@ -18619,7 +17605,7 @@ +@@ -18639,7 +17626,7 @@ # Check whether --with-gdktarget was given. @@ -10800,7 +10798,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_gdktarget; gdktarget=$with_gdktarget fi -@@ -18627,9 +17613,7 @@ +@@ -18647,9 +17634,7 @@ case $gdktarget in x11|win32|quartz|directfb) ;; @@ -10811,7 +10809,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -@@ -18663,7 +17647,7 @@ +@@ -18683,7 +17668,7 @@ # Build time sanity check... @@ -10820,7 +10818,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -18674,15 +17658,11 @@ +@@ -18694,15 +17679,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -10838,7 +10836,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -18704,11 +17684,8 @@ +@@ -18724,11 +17705,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -10852,7 +10850,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi test "$2" = conftest.file -@@ -18717,27 +17694,20 @@ +@@ -18737,27 +17715,20 @@ # Ok. : else @@ -10886,7 +10884,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -18762,54 +17732,27 @@ +@@ -18782,54 +17753,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10949,7 +10947,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -@@ -18822,9 +17765,9 @@ +@@ -18842,9 +17786,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -10961,7 +10959,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18835,24 +17778,24 @@ +@@ -18855,24 +17799,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10991,7 +10989,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18862,9 +17805,9 @@ +@@ -18882,9 +17826,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -11003,7 +11001,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -18875,24 +17818,24 @@ +@@ -18895,24 +17839,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11033,7 +11031,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18901,7 +17844,7 @@ +@@ -18921,7 +17865,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11042,7 +11040,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18915,9 +17858,9 @@ +@@ -18935,9 +17879,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -11054,7 +11052,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18928,24 +17871,24 @@ +@@ -18948,24 +17892,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11084,7 +11082,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -18955,9 +17898,9 @@ +@@ -18975,9 +17919,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -11096,7 +11094,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18969,18 +17912,18 @@ +@@ -18989,18 +17933,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11118,7 +11116,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -18999,10 +17942,10 @@ +@@ -19019,10 +17963,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -11131,7 +11129,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -19014,9 +17957,9 @@ +@@ -19034,9 +17978,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -11143,7 +11141,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -19027,24 +17970,24 @@ +@@ -19047,24 +17991,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11173,7 +11171,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -19058,9 +18001,9 @@ +@@ -19078,9 +18022,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -11185,7 +11183,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -19071,24 +18014,24 @@ +@@ -19091,24 +18035,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11215,7 +11213,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -19101,7 +18044,7 @@ +@@ -19121,7 +18065,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11224,7 +11222,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -19112,62 +18055,42 @@ +@@ -19132,62 +18076,42 @@ fi @@ -11256,17 +11254,6 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in @@ -11275,13 +11262,24 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 +- (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... @@ -11309,7 +11307,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -19181,37 +18104,16 @@ +@@ -19201,37 +18125,16 @@ return 0; } _ACEOF @@ -11350,7 +11348,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -19220,20 +18122,16 @@ +@@ -19240,20 +18143,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -11374,7 +11372,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -19244,35 +18142,11 @@ +@@ -19264,35 +18163,11 @@ return 0; } _ACEOF @@ -11413,7 +11411,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -19283,36 +18157,12 @@ +@@ -19303,36 +18178,12 @@ return 0; } _ACEOF @@ -11454,7 +11452,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -19323,42 +18173,17 @@ +@@ -19343,42 +18194,17 @@ return 0; } _ACEOF @@ -11499,7 +11497,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -19375,18 +18200,14 @@ +@@ -19395,18 +18221,14 @@ CFLAGS= fi fi @@ -11521,7 +11519,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include #include -@@ -19443,32 +18264,9 @@ +@@ -19463,32 +18285,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -11555,7 +11553,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -19479,17 +18277,19 @@ +@@ -19499,17 +18298,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -11578,7 +11576,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -19499,9 +18299,9 @@ +@@ -19519,9 +18320,9 @@ depcc="$CC" am_compiler_list= @@ -11590,7 +11588,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -19609,7 +18409,7 @@ +@@ -19629,7 +18430,7 @@ fi fi @@ -11599,7 +11597,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -19628,22 +18428,18 @@ +@@ -19648,22 +18449,18 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc if test "x$CC" != xcc; then @@ -11626,7 +11624,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -19659,63 +18455,63 @@ +@@ -19679,63 +18476,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -11715,7 +11713,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure then # cc works too. : -@@ -19732,15 +18528,13 @@ +@@ -19752,15 +18549,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -11734,7 +11732,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi -@@ -19759,104 +18553,12 @@ +@@ -19779,104 +18574,12 @@ fi @@ -11841,7 +11839,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -19874,11 +18576,11 @@ +@@ -19894,11 +18597,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -11855,7 +11853,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -19912,7 +18614,7 @@ +@@ -19932,7 +18635,7 @@ if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -11864,7 +11862,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" -@@ -19932,13 +18634,13 @@ +@@ -19952,13 +18655,13 @@ ;; esac if test x"$msnative_struct" = x ; then @@ -11881,7 +11879,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "${msnative_struct}" >&6; } fi fi -@@ -19959,9 +18661,9 @@ +@@ -19979,9 +18682,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -11893,7 +11891,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -19974,14 +18676,14 @@ +@@ -19994,14 +18697,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11911,7 +11909,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -19989,10 +18691,10 @@ +@@ -20009,10 +18712,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -11924,7 +11922,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -20002,9 +18704,9 @@ +@@ -20022,9 +18725,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -11936,7 +11934,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -20017,14 +18719,14 @@ +@@ -20037,14 +18740,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11954,7 +11952,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -20032,10 +18734,10 @@ +@@ -20052,10 +18755,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -11967,7 +11965,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -20044,7 +18746,7 @@ +@@ -20064,7 +18767,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11976,7 +11974,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -20057,13 +18759,13 @@ +@@ -20077,13 +18780,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -11993,7 +11991,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -20071,40 +18773,44 @@ +@@ -20091,40 +18794,44 @@ fi pkg_failed=no @@ -12057,7 +12055,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi -@@ -20117,25 +18823,14 @@ +@@ -20137,25 +18844,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -12086,7 +12084,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -20145,22 +18840,11 @@ +@@ -20165,22 +18861,11 @@ Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. @@ -12112,7 +12110,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20169,12 +18853,11 @@ +@@ -20189,12 +18874,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -12127,7 +12125,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "yes" >&6; } : fi -@@ -20191,40 +18874,44 @@ +@@ -20211,40 +18895,44 @@ fi pkg_failed=no @@ -12191,7 +12189,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi -@@ -20237,25 +18924,14 @@ +@@ -20257,25 +18945,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -12220,7 +12218,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $CAIRO_BACKEND_PKG_ERRORS -@@ -20265,22 +18941,11 @@ +@@ -20285,22 +18962,11 @@ Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. @@ -12246,7 +12244,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20289,12 +18954,11 @@ +@@ -20309,12 +18975,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -12261,7 +12259,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "yes" >&6; } : fi -@@ -20311,14 +18975,14 @@ +@@ -20331,14 +18996,14 @@ # Check whether --enable-explicit-deps was given. @@ -12278,7 +12276,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } case $enable_explicit_deps in auto) -@@ -20332,12 +18996,10 @@ +@@ -20352,12 +19017,10 @@ ;; yes|no) ;; @@ -12293,7 +12291,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$enable_explicit_deps" >&6; } if test $enable_explicit_deps = no; then -@@ -20356,9 +19018,9 @@ +@@ -20376,9 +19039,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -12305,7 +12303,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $PERL in -@@ -20371,14 +19033,14 @@ +@@ -20391,14 +19054,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12323,7 +12321,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -20386,10 +19048,10 @@ +@@ -20406,10 +19069,10 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -12336,7 +12334,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -20401,9 +19063,9 @@ +@@ -20421,9 +19084,9 @@ # We would like indent, but don't require it. # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 @@ -12348,7 +12346,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$INDENT"; then -@@ -20414,24 +19076,24 @@ +@@ -20434,24 +19097,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12378,24 +12376,11 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -20445,283 +19107,67 @@ +@@ -20465,206 +19128,25 @@ fi -- -- -- -- - for ac_func in lstat mkstemp flockfile getc_unlocked --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ ++for ac_func in lstat mkstemp flockfile getc_unlocked +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -12403,119 +12388,12 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+fi -+done - --#ifdef __STDC__ --# include --#else --# include --#endif -+for ac_func in localtime_r -+do : -+ ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" -+if test "x$ac_cv_func_localtime_r" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LOCALTIME_R 1 +_ACEOF --#undef $ac_func -+fi -+done - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - -+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5 -+$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - int - main () - { --return $ac_func (); -+ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done - - --for ac_func in localtime_r +- +-for ac_func in lstat mkstemp flockfile getc_unlocked -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -12615,24 +12493,58 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -fi -done - -- --# _NL_TIME_FIRST_WEEKDAY is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 --$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } --cat >conftest.$ac_ext <<_ACEOF ++fi ++done + + for ac_func in localtime_r +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ --#include +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- -int -main () -{ -- --char c; --c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -- +-return $ac_func (); - ; - return 0; -} @@ -12658,6 +12570,75 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" ++if test "x$ac_cv_func_localtime_r" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_LOCALTIME_R 1 + _ACEOF + + fi +@@ -20672,13 +19154,9 @@ + + + # _NL_TIME_FIRST_WEEKDAY is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5 + $as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -20692,56 +19170,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +if ac_fn_c_try_link "$LINENO"; then : gtk_ok=yes else @@ -12698,7 +12679,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -20735,56 +19181,25 @@ +@@ -20755,56 +19202,25 @@ return 0; } _ACEOF @@ -12763,7 +12744,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -20798,56 +19213,25 @@ +@@ -20818,56 +19234,25 @@ return 0; } _ACEOF @@ -12828,7 +12809,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -20861,56 +19245,25 @@ +@@ -20881,56 +19266,25 @@ return 0; } _ACEOF @@ -12893,7 +12874,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -20924,424 +19277,92 @@ +@@ -20944,263 +19298,66 @@ return 0; } _ACEOF @@ -13037,8 +13018,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -13071,13 +13051,10 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ fi -+ fi -+ USE_NLS=yes - +- - ac_header_preproc=no -fi - +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -13197,16 +13174,11 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF -- -- fi -- fi -- USE_NLS=yes -- -- -- gt_cv_have_gettext=no -+ gt_cv_have_gettext=no ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - CATOBJEXT=NONE + fi + fi +@@ -21213,155 +19370,20 @@ XGETTEXT=: INTLLIBS= @@ -13367,7 +13339,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include -@@ -21354,54 +19375,25 @@ +@@ -21374,54 +19396,25 @@ return 0; } _ACEOF @@ -13430,7 +13402,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include -@@ -21414,141 +19406,26 @@ +@@ -21434,141 +19427,26 @@ return 0; } _ACEOF @@ -13582,7 +13554,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure _ACEOF fi -@@ -21563,18 +19440,14 @@ +@@ -21583,18 +19461,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -13604,7 +13576,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21592,55 +19465,26 @@ +@@ -21612,55 +19486,26 @@ return 0; } _ACEOF @@ -13669,7 +13641,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21658,55 +19502,26 @@ +@@ -21678,55 +19523,26 @@ return 0; } _ACEOF @@ -13734,7 +13706,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21724,43 +19539,18 @@ +@@ -21744,43 +19560,18 @@ return 0; } _ACEOF @@ -13784,7 +13756,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure gt_cv_func_dgettext_libintl=yes fi -@@ -21770,22 +19560,18 @@ +@@ -21790,22 +19581,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -13812,7 +13784,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21803,55 +19589,26 @@ +@@ -21823,55 +19610,26 @@ return 0; } _ACEOF @@ -13877,7 +13849,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21869,43 +19626,18 @@ +@@ -21889,43 +19647,18 @@ return 0; } _ACEOF @@ -13927,7 +13899,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else -@@ -21927,102 +19659,12 @@ +@@ -21947,102 +19680,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset @@ -14035,7 +14007,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure _ACEOF fi -@@ -22052,15 +19694,13 @@ +@@ -22072,15 +19715,13 @@ if test "$gt_cv_have_gettext" = "yes"; then @@ -14054,7 +14026,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -22085,118 +19725,28 @@ +@@ -22105,118 +19746,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14181,7 +14153,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF -@@ -22211,14 +19761,14 @@ +@@ -22231,14 +19782,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -14201,7 +14173,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 -@@ -22226,9 +19776,9 @@ +@@ -22246,9 +19797,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 @@ -14213,7 +14185,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -22241,14 +19791,14 @@ +@@ -22261,14 +19812,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14231,7 +14203,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -22257,19 +19807,19 @@ +@@ -22277,19 +19828,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14255,7 +14227,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -22294,18 +19844,14 @@ +@@ -22314,18 +19865,14 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14277,7 +14249,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ int -@@ -22317,121 +19863,14 @@ +@@ -22337,121 +19884,14 @@ return 0; } _ACEOF @@ -14403,7 +14375,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure CATOBJEXT=.gmo DATADIRNAME=share else -@@ -22446,10 +19885,8 @@ +@@ -22466,10 +19906,8 @@ ;; esac fi @@ -14416,7 +14388,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else -@@ -22463,9 +19900,7 @@ +@@ -22483,9 +19921,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then @@ -14427,7 +14399,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi -@@ -22473,7 +19908,7 @@ +@@ -22493,7 +19929,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -14436,7 +14408,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi -@@ -22506,7 +19941,7 @@ +@@ -22526,7 +19962,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -14445,7 +14417,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do -@@ -22531,7 +19966,7 @@ +@@ -22551,7 +19987,7 @@ fi done LINGUAS=$NEW_LINGUAS @@ -14454,7 +14426,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$LINGUAS" >&6; } fi -@@ -22602,129 +20037,67 @@ +@@ -22622,129 +20058,67 @@ @@ -14604,7 +14576,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } ;; esac -@@ -22732,27 +20105,23 @@ +@@ -22753,27 +20127,23 @@ # # see bug 162979 # @@ -14637,7 +14609,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -22763,37 +20132,13 @@ +@@ -22784,37 +20154,13 @@ return 0; } _ACEOF @@ -14679,7 +14651,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include int -@@ -22804,40 +20149,18 @@ +@@ -22825,40 +20171,18 @@ return 0; } _ACEOF @@ -14724,7 +14696,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # -@@ -22847,7 +20170,7 @@ +@@ -22868,7 +20192,7 @@ GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" # Check whether --enable-glibtest was given. @@ -14733,7 +14705,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_glibtest; else enable_glibtest=yes -@@ -22882,9 +20205,9 @@ +@@ -22903,9 +20227,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -14745,7 +14717,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -22897,14 +20220,14 @@ +@@ -22918,14 +20242,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14763,7 +14735,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -22912,10 +20235,10 @@ +@@ -22933,10 +20257,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -14776,7 +14748,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -22925,9 +20248,9 @@ +@@ -22946,9 +20270,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -14788,7 +14760,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -22940,14 +20263,14 @@ +@@ -22961,14 +20285,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14806,7 +14778,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -22955,10 +20278,10 @@ +@@ -22976,10 +20300,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -14819,7 +14791,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -22967,7 +20290,7 @@ +@@ -22988,7 +20312,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -14828,7 +14800,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -22980,13 +20303,13 @@ +@@ -23001,13 +20325,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -14845,7 +14817,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -23001,7 +20324,7 @@ +@@ -23022,7 +20346,7 @@ fi min_glib_version=2.21.3 @@ -14854,7 +14826,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } if test x$PKG_CONFIG != xno ; then -@@ -23037,14 +20360,10 @@ +@@ -23058,14 +20382,10 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$GLIB_LIBS $LIBS" rm -f conf.glibtest @@ -14871,7 +14843,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ #include -@@ -23056,9 +20375,8 @@ +@@ -23077,9 +20397,8 @@ { int major, minor, micro; char *tmp_version; @@ -14882,7 +14854,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); -@@ -23120,5893 +20438,1048 @@ +@@ -23141,5893 +20460,1048 @@ } _ACEOF @@ -21604,7 +21576,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -29015,68 +21488,45 @@ +@@ -29036,68 +21510,45 @@ #ifdef __cplusplus extern "C" #endif @@ -21696,7 +21668,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -29085,98 +21535,46 @@ +@@ -29106,98 +21557,46 @@ #ifdef __cplusplus extern "C" #endif @@ -21818,7 +21790,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -29184,71 +21582,65 @@ +@@ -29205,71 +21604,65 @@ #ifdef __cplusplus extern "C" #endif @@ -21933,7 +21905,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -29257,68 +21649,63 @@ +@@ -29278,68 +21671,63 @@ #ifdef __cplusplus extern "C" #endif @@ -22043,7 +22015,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -29327,92 +21714,71 @@ +@@ -29348,92 +21736,71 @@ #ifdef __cplusplus extern "C" #endif @@ -22182,7 +22154,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -29420,71 +21786,92 @@ +@@ -29441,71 +21808,92 @@ #ifdef __cplusplus extern "C" #endif @@ -22325,7 +22297,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -29493,898 +21880,672 @@ +@@ -29514,898 +21902,672 @@ #ifdef __cplusplus extern "C" #endif @@ -23751,7 +23723,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30392,569 +22553,606 @@ +@@ -30413,569 +22575,606 @@ #ifdef __cplusplus extern "C" #endif @@ -24816,7 +24788,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30962,73 +23160,26 @@ +@@ -30983,73 +23182,26 @@ #ifdef __cplusplus extern "C" #endif @@ -24898,7 +24870,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -31037,450 +23188,346 @@ +@@ -31058,450 +23210,346 @@ #ifdef __cplusplus extern "C" #endif @@ -25618,7 +25590,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -31489,870 +23536,640 @@ +@@ -31510,867 +23558,640 @@ #ifdef __cplusplus extern "C" #endif @@ -25979,8 +25951,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XINERAMA 1 --_ACEOF -- ++ for ac_func in XConvertCase XInternAtoms ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else @@ -25995,24 +25975,25 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - fi - - # set up things for XInput -- -- if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then -- --cat >>confdefs.h <<\_ACEOF --#define XINPUT_XFREE 1 -+ for ac_func in XConvertCase XInternAtoms -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - +fi +done +- if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define XINPUT_XFREE 1 +-_ACEOF ++ # Generic X11R6 check needed for XIM support; we could ++ # probably use this to replace the above, but we'll ++ # leave the separate checks for XConvertCase and XInternAtoms ++ # for clarity + ++ have_x11r6=false ++ ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch" ++if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then : ++ have_x11r6=true ++fi + - if $PKG_CONFIG --exists xi ; then - X_PACKAGES="$X_PACKAGES xi" - else @@ -26020,30 +26001,29 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - *-lXi[\ \ ]*) ;; - *) x_extra_libs="-lXi $x_extra_libs" ;; - esac -- + - fi - else -- ++ if $have_x11r6; then + -cat >>confdefs.h <<\_ACEOF -#define XINPUT_NONE 1 -_ACEOF ++$as_echo "#define HAVE_X11R6 1" >>confdefs.h -- fi -+ # Generic X11R6 check needed for XIM support; we could -+ # probably use this to replace the above, but we'll -+ # leave the separate checks for XConvertCase and XInternAtoms -+ # for clarity - + fi +- - if test x$with_xinput = xxfree || test x$with_xinput = xyes; then - XINPUT_XFREE_TRUE= - XINPUT_XFREE_FALSE='#' --else ++ if $have_x11r6; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' + else - XINPUT_XFREE_TRUE='#' - XINPUT_XFREE_FALSE= -+ have_x11r6=false -+ ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch" -+if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then : -+ have_x11r6=true ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= fi @@ -26053,20 +26033,11 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat >>confdefs.h <<\_ACEOF -#define HAVE_RANDR 1 -_ACEOF -+ if $have_x11r6; then - -+$as_echo "#define HAVE_X11R6 1" >>confdefs.h - +- +- - X_PACKAGES="$X_PACKAGES xrandr" - fi -+ if $have_x11r6; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' -+else -+ HAVE_X11R6_TRUE='#' -+ HAVE_X11R6_FALSE= -+fi - +- fi +- - # Checks for Xcursor library - - if $PKG_CONFIG --exists xcursor ; then @@ -26074,7 +26045,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat >>confdefs.h <<\_ACEOF -#define HAVE_XCURSOR 1 -_ACEOF - +- + # Check for XKB support. - X_PACKAGES="$X_PACKAGES xcursor" @@ -26246,36 +26217,18 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - if true; then - USE_WIN32_TRUE= - USE_WIN32_FALSE='#' --else -- USE_WIN32_TRUE='#' -- USE_WIN32_FALSE= --fi + fi - --else -- if false; then -- USE_WIN32_TRUE= -- USE_WIN32_FALSE='#' --else -- USE_WIN32_TRUE='#' -- USE_WIN32_FALSE= --fi ++ + if test "x$enable_shm" = "xyes"; then + # Check for shared memory + ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ipc_h" = x""yes; then : - --fi ++ +$as_echo "#define HAVE_IPC_H 1" >>confdefs.h - --if test "x$gdktarget" = "xquartz"; then -- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -- if true; then -- USE_QUARTZ_TRUE= -- USE_QUARTZ_FALSE='#' ++ else -- USE_QUARTZ_TRUE='#' -- USE_QUARTZ_FALSE= +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= + no_sys_ipc=yes fi @@ -26287,19 +26240,25 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + else - if false; then -- USE_QUARTZ_TRUE= -- USE_QUARTZ_FALSE='#' +- USE_WIN32_TRUE= +- USE_WIN32_FALSE='#' -else -- USE_QUARTZ_TRUE='#' -- USE_QUARTZ_FALSE= +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= + no_sys_shm=yes fi -fi --GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" --GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" - +-if test "x$gdktarget" = "xquartz"; then +- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" +- if true; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' +-else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= ++ + # Check for the X shared memory extension header file + have_xshm=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11/extensions/XShm.h" >&5 @@ -26311,7 +26270,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + CFLAGS="$CFLAGS $x_cflags" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ++ +#include +#include +#include @@ -26319,7 +26278,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +#include +#include +#include - ++ +int +main () +{ @@ -26330,28 +26289,24 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + have_xshm=yes -+fi + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gtk_save_CFLAGS" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xshm" >&5 +$as_echo "$have_xshm" >&6; } + if test $have_xshm = yes ; then - ++ +$as_echo "#define HAVE_XSHM_H 1" >>confdefs.h - ++ + fi + fi - ++ + if test "x$enable_xinerama" = "xyes"; then + # Check for Xinerama extension (Solaris impl or Xfree impl) + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $x_cflags" - --if test "x$gdktarget" = "xdirectfb"; then -- DIRECTFB_REQUIRED_VERSION=1.0.0 -- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 --$as_echo_n "checking for DirectFB... " >&6; } ++ + # Check for XFree + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on XFree86" >&5 +$as_echo_n "checking for Xinerama support on XFree86... " >&6; } @@ -26365,15 +26320,15 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then : + $as_echo_n "(cached) " >&6 -+else + else +- if false; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - --pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for DIRECTFB" >&5 --$as_echo_n "checking for DIRECTFB... " >&6; } ++ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -26391,13 +26346,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xinerama_XineramaQueryExtension=yes -+else + else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= + ac_cv_lib_Xinerama_XineramaQueryExtension=no -+fi + fi +- +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS -+fi + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : @@ -26409,6 +26367,44 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + *) x_extra_libs="-lXinerama $x_extra_libs" ;; + esac +-GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" ++ have_xfree_xinerama=true ++else ++ : ++fi + + ++fi + ++ fi + ++ if $have_xfree_xinerama ; then + ++$as_echo "#define HAVE_XFREE_XINERAMA 1" >>confdefs.h + + +-if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=1.0.0 +- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 +-$as_echo_n "checking for DirectFB... " >&6; } ++$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + +-pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for DIRECTFB" >&5 +-$as_echo_n "checking for DIRECTFB... " >&6; } ++ case "$host" in ++ *-*-solaris*) ++ # Check for solaris ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5 ++$as_echo_n "checking for Xinerama support on Solaris... " >&6; } + -if test -n "$DIRECTFB_CFLAGS"; then - pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" - elif test -n "$PKG_CONFIG"; then @@ -26419,16 +26415,12 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` -+ have_xfree_xinerama=true - else +-else - pkg_failed=yes -+ : - fi +-fi - else - pkg_failed=untried -+ -+ - fi +-fi -if test -n "$DIRECTFB_LIBS"; then - pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" - elif test -n "$PKG_CONFIG"; then @@ -26439,28 +26431,6 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` -+ -+ fi -+ -+ if $have_xfree_xinerama ; then -+ -+$as_echo "#define HAVE_XFREE_XINERAMA 1" >>confdefs.h -+ -+ -+$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ -+ case "$host" in -+ *-*-solaris*) -+ # Check for solaris -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5 -+$as_echo_n "checking for Xinerama support on Solaris... " >&6; } -+ + have_solaris_xinerama=false + ac_fn_c_check_func "$LINENO" "XineramaGetInfo" "ac_cv_func_XineramaGetInfo" +if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then : @@ -26732,7 +26702,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + X_PACKAGES="$X_PACKAGES xfixes" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" + fi - ++ + # Checks for Xcomposite extension + if $PKG_CONFIG --exists xcomposite ; then @@ -26746,10 +26716,12 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + # Checks for Xdamage extension ++ if $PKG_CONFIG --exists xdamage ; then + -######################################## -# Check for Accessibility Toolkit flags -######################################## -+ if $PKG_CONFIG --exists xdamage ; then ++$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h -ATK_PACKAGES=atk -{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 @@ -26757,11 +26729,26 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -if $PKG_CONFIG --exists $ATK_PACKAGES ; then - ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` - ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -+$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h - { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 -$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } --else ++ X_PACKAGES="$X_PACKAGES xdamage" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" ++ fi ++ ++ if $have_base_x_pc ; then ++ GDK_EXTRA_LIBS="$x_extra_libs" ++ else ++ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" ++ fi ++ ++ CPPFLAGS="$gtk_save_cppflags" ++ LIBS="$gtk_save_libs" ++ ++ if true; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' + else - { { $as_echo "$as_me:$LINENO: error: -*** Accessibility Toolkit not found. Accessibility Toolkit is required -*** to build GTK+. @@ -26771,11 +26758,13 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -*** to build GTK+. -" >&2;} - { (exit 1); exit 1; }; } --fi ++ USE_X11_TRUE='#' ++ USE_X11_FALSE= + fi -if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then - : --else + else - gtk_save_LIBS="$LIBS" - LIBS="$ATK_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF @@ -26784,9 +26773,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ X_PACKAGES="$X_PACKAGES xdamage" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" -+ fi ++ XPACKAGES= -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -26825,14 +26812,23 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_test_x conftest$ac_exeext - }; then - : --else ++ if false; then ++ XINPUT_XFREE_TRUE= ++ XINPUT_XFREE_FALSE='#' ++else ++ XINPUT_XFREE_TRUE='#' ++ XINPUT_XFREE_FALSE= ++fi ++ ++ if false; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if $have_base_x_pc ; then -+ GDK_EXTRA_LIBS="$x_extra_libs" -+ else -+ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" -+ fi ++ USE_X11_TRUE='#' ++ USE_X11_FALSE= ++fi - { { $as_echo "$as_me:$LINENO: error: - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required @@ -26841,41 +26837,31 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required - *** to build GTK+" >&2;} - { (exit 1); exit 1; }; } -+ CPPFLAGS="$gtk_save_cppflags" -+ LIBS="$gtk_save_libs" -+ -+ if true; then -+ USE_X11_TRUE= -+ USE_X11_FALSE='#' ++ if false; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' +else -+ USE_X11_TRUE='#' -+ USE_X11_FALSE= ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gtk_save_LIBS" -+else -+ XPACKAGES= -+ -+ if false; then -+ XINPUT_XFREE_TRUE= -+ XINPUT_XFREE_FALSE='#' -+else -+ XINPUT_XFREE_TRUE='#' -+ XINPUT_XFREE_FALSE= fi -GTK_PACKAGES="atk cairo gio-2.0" -if test "x$gdktarget" = "xx11"; then - GTK_PACKAGES="$GTK_PACKAGES pangoft2" -+ if false; then -+ USE_X11_TRUE= -+ USE_X11_FALSE='#' ++if test "x$gdktarget" = "xwin32"; then ++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" ++ if true; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' +else -+ USE_X11_TRUE='#' -+ USE_X11_FALSE= ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= fi -GTK_EXTRA_LIBS= -GTK_EXTRA_CFLAGS= @@ -26884,12 +26870,13 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -if test x"$os_win32" = xyes; then - GTK_EXTRA_CFLAGS="$msnative_struct" -+ if false; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' +else -+ HAVE_X11R6_TRUE='#' -+ HAVE_X11R6_FALSE= ++ if false; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' ++else ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= fi -GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" @@ -26900,27 +26887,6 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -if test $enable_explicit_deps != yes ; then - GDK_PIXBUF_EXTRA_LIBS= -+if test "x$gdktarget" = "xwin32"; then -+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -+ if true; then -+ USE_WIN32_TRUE= -+ USE_WIN32_FALSE='#' -+else -+ USE_WIN32_TRUE='#' -+ USE_WIN32_FALSE= - fi - -+else -+ if false; then -+ USE_WIN32_TRUE= -+ USE_WIN32_FALSE='#' -+else -+ USE_WIN32_TRUE='#' -+ USE_WIN32_FALSE= -+fi - -+fi - +if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" + if true; then @@ -26929,7 +26895,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +else + USE_QUARTZ_TRUE='#' + USE_QUARTZ_FALSE= -+fi + fi +else + if false; then @@ -26947,7 +26913,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -@@ -32360,204 +24177,152 @@ +@@ -32378,207 +24199,152 @@ @@ -27015,10 +26981,26 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + # Put the nasty error message in config.log where it belongs + echo "$DIRECTFB_PKG_ERRORS" >&5 ++ as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: + ++$DIRECTFB_PKG_ERRORS + ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + -######################## -# Checks needed for gail -######################## -+ as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: ++Alternatively, you may set the environment variables DIRECTFB_CFLAGS ++and DIRECTFB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. -old_LIBS="$LIBS" -{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 @@ -27033,7 +27015,9 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+$DIRECTFB_PKG_ERRORS ++Alternatively, you may set the environment variables DIRECTFB_CFLAGS ++and DIRECTFB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -27079,67 +27063,44 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_gethostent=$ac_res --else ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+Alternatively, you may set the environment variables DIRECTFB_CFLAGS -+and DIRECTFB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" "$LINENO" 5 -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - +- +- -fi -+Alternatively, you may set the environment variables DIRECTFB_CFLAGS -+and DIRECTFB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostent+set}" = set; then - break --fi --done --if test "${ac_cv_search_gethostent+set}" = set; then -- : -+To get pkg-config, see . -+See \`config.log' for more details." "$LINENO" 5; } - else -- ac_cv_search_gethostent=no + DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS + DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS +-done +-if test "${ac_cv_search_gethostent+set}" = set; then +- : + if true; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' -+else -+ USE_DIRECTFB_TRUE='#' -+ USE_DIRECTFB_FALSE= - fi + else +- ac_cv_search_gethostent=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -$as_echo "$ac_cv_search_gethostent" >&6; } -ac_res=$ac_cv_search_gethostent -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+else -+ if false; then -+ USE_DIRECTFB_TRUE= -+ USE_DIRECTFB_FALSE='#' -+else +- + USE_DIRECTFB_TRUE='#' + USE_DIRECTFB_FALSE= fi @@ -27148,7 +27109,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -$as_echo_n "checking for library containing setsockopt... " >&6; } -if test "${ac_cv_search_setsockopt+set}" = set; then - $as_echo_n "(cached) " >&6 --else + else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -27156,8 +27117,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -27202,16 +27162,16 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_setsockopt=$ac_res --else ++ if false; then ++ USE_DIRECTFB_TRUE= ++ USE_DIRECTFB_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -+# Check for Pango flags - -+if test "x$gdktarget" = "xwin32"; then -+ PANGO_PACKAGES="pangowin32 pangocairo" -+else -+ PANGO_PACKAGES="pango pangocairo" +- +- ++ USE_DIRECTFB_TRUE='#' ++ USE_DIRECTFB_FALSE= fi -rm -rf conftest.dSYM @@ -27219,10 +27179,29 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - conftest$ac_exeext - if test "${ac_cv_search_setsockopt+set}" = set; then - break --fi + fi -done -if test "${ac_cv_search_setsockopt+set}" = set; then - : ++ ++ ++# Check for Pango flags ++ ++if test "x$gdktarget" = "xwin32"; then ++ PANGO_PACKAGES="pangowin32 pangocairo" + else +- ac_cv_search_setsockopt=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++ PANGO_PACKAGES="pango pangocairo" + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +-$as_echo "$ac_cv_search_setsockopt" >&6; } +-ac_res=$ac_cv_search_setsockopt +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Pango flags" >&5 +$as_echo_n "checking Pango flags... " >&6; } +if $PKG_CONFIG --exists $PANGO_PACKAGES ; then @@ -27231,29 +27210,19 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } - else -- ac_cv_search_setsockopt=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS ++else + as_fn_error " +*** Pango not found. Pango built with Cairo support is required +*** to build GTK+. See http://www.pango.org for Pango information. +" "$LINENO" 5 fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 --$as_echo "$ac_cv_search_setsockopt" >&6; } --ac_res=$ac_cv_search_setsockopt --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - --fi -+CFLAGS="$CFLAGS $PANGO_CFLAGS" -{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 -$as_echo_n "checking for library containing connect... " >&6; } -if test "${ac_cv_search_connect+set}" = set; then - $as_echo_n "(cached) " >&6 ++CFLAGS="$CFLAGS $PANGO_CFLAGS" ++ +if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then + : else @@ -27269,7 +27238,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32566,539 +24331,274 @@ +@@ -32587,539 +24353,274 @@ #ifdef __cplusplus extern "C" #endif @@ -27992,7 +27961,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -33106,640 +24606,358 @@ +@@ -33127,640 +24628,358 @@ #ifdef __cplusplus extern "C" #endif @@ -28112,19 +28081,19 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure - fi -fi +GAIL_INET_LIBS="$LIBS" -+ -+ -+LIBS="$old_LIBS" -# Checks to see if we should compile with PAPI backend for GTK+ -# -+################################################################ -+# Printing system checks -+################################################################ -# Check whether --enable-papi was given. -if test "${enable_papi+set}" = set; then - enableval=$enable_papi; ++LIBS="$old_LIBS" ++ ++################################################################ ++# Printing system checks ++################################################################ ++ +# Check whether --enable-cups was given. +if test "${enable_cups+set}" = set; then : + enableval=$enable_cups; @@ -28894,7 +28863,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi -@@ -33749,7 +24967,7 @@ +@@ -33770,7 +24989,7 @@ # Check whether --enable-test-print-backend was given. @@ -28903,7 +28872,96 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_test_print_backend; else enable_test_print_backend=no -@@ -33794,136 +25012,8 @@ +@@ -33816,62 +25035,59 @@ + + + # Check whether --enable-introspection was given. +-if test "${enable_introspection+set}" = set; then ++if test "${enable_introspection+set}" = set; then : + enableval=$enable_introspection; + else + enable_introspection=auto + fi + + +- { $as_echo "$as_me:$LINENO: checking for gobject-introspection" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 + $as_echo_n "checking for gobject-introspection... " >&6; } + +- case $enable_introspection in +- no) found_introspection="no (disabled, use --enable-introspection to enable)" +- ;; +- yes) if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5 ++ case $enable_introspection in #( ++ no) : ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ;; #( ++ yes) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: gobject-introspection-1.0 is not installed" >&5 +-$as_echo "$as_me: error: gobject-introspection-1.0 is not installed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5 + fi + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + found_introspection=yes + else +- { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= 0.6.7 installed to build gtk+" >&5 +-$as_echo "$as_me: error: You need to have gobject-introspection >= 0.6.7 installed to build gtk+" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5 + fi +- ;; +- auto) if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\"") >&5 ++ ;; #( ++ auto) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + found_introspection=yes + else + found_introspection=no + fi +- ;; +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&5 +-$as_echo "$as_me: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&2;} +- { (exit 1); exit 1; }; } ++ ;; #( ++ *) : ++ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + ;; + esac +- +- { $as_echo "$as_me:$LINENO: result: $found_introspection" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 + $as_echo "$found_introspection" >&6; } + + INTROSPECTION_SCANNER= +@@ -33923,136 +25139,8 @@ @@ -29041,7 +29099,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_html_dir; else with_html_dir='${datadir}/gtk-doc/html' -@@ -33933,7 +25023,7 @@ +@@ -34062,7 +25150,7 @@ # Check whether --enable-gtk-doc was given. @@ -29050,7 +29108,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_gtk_doc; else enable_gtk_doc=no -@@ -33942,42 +25032,66 @@ +@@ -34071,42 +25159,66 @@ if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -29141,7 +29199,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test x$enable_gtk_doc = xyes; then -@@ -33988,22 +25102,6 @@ +@@ -34117,22 +25229,6 @@ ENABLE_GTK_DOC_FALSE= fi @@ -29164,7 +29222,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if test -n "$LIBTOOL"; then GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' -@@ -34012,21 +25110,13 @@ +@@ -34141,21 +25237,13 @@ GTK_DOC_USE_LIBTOOL_FALSE= fi @@ -29188,7 +29246,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else if test -n "$DB2HTML"; then -@@ -34037,14 +25127,14 @@ +@@ -34166,14 +25254,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -29206,7 +29264,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" -@@ -34052,10 +25142,10 @@ +@@ -34181,10 +25269,10 @@ fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -29219,7 +29277,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -34070,7 +25160,7 @@ +@@ -34199,7 +25287,7 @@ # Check whether --enable-man was given. @@ -29228,7 +29286,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure enableval=$enable_man; enable_man=yes else enable_man=no -@@ -34080,9 +25170,9 @@ +@@ -34209,9 +25297,9 @@ if test "${enable_man}" != no; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -29240,7 +29298,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -34095,14 +25185,14 @@ +@@ -34224,14 +25312,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -29258,7 +29316,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -34110,10 +25200,10 @@ +@@ -34239,10 +25327,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -29271,7 +29329,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -34126,7 +25216,7 @@ +@@ -34255,7 +25343,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -29280,7 +29338,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -34135,23 +25225,23 @@ +@@ -34264,23 +25352,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -29309,7 +29367,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -34164,14 +25254,14 @@ +@@ -34293,14 +25381,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -29327,7 +29385,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -34180,10 +25270,10 @@ +@@ -34309,10 +25397,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -29340,7 +29398,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "no" >&6; } fi -@@ -34199,35 +25289,35 @@ +@@ -34328,35 +25416,35 @@ fi @@ -29388,7 +29446,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "not found" >&6; } enable_man=no fi -@@ -34281,13 +25371,13 @@ +@@ -34410,13 +25498,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -29404,7 +29462,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac ;; esac done -@@ -34295,8 +25385,8 @@ +@@ -34424,8 +25512,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -29415,7 +29473,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -34319,11 +25409,11 @@ +@@ -34448,11 +25536,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -29429,7 +29487,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -34343,8 +25433,8 @@ +@@ -34472,8 +25560,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -29440,7 +29498,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure done LIBOBJS=$ac_libobjs -@@ -34360,587 +25450,334 @@ +@@ -34489,594 +25577,338 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -30120,6 +30178,15 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"TEST_PRINT_BACKEND\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INTROSPECTION\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_INTROSPECTION\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then @@ -30193,7 +30260,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -34950,17 +25787,18 @@ +@@ -35086,17 +25918,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -30219,7 +30286,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -34968,23 +25806,15 @@ +@@ -35104,23 +25937,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -30248,7 +30315,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure as_nl=' ' export as_nl -@@ -34992,7 +25822,13 @@ +@@ -35128,7 +25953,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -30263,7 +30330,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -35003,7 +25839,7 @@ +@@ -35139,7 +25970,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -30272,7 +30339,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -35026,13 +25862,6 @@ +@@ -35162,13 +25993,6 @@ } fi @@ -30286,7 +30353,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -35042,15 +25871,15 @@ +@@ -35178,15 +26002,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -30305,7 +30372,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure IFS=$as_save_IFS ;; -@@ -35062,12 +25891,16 @@ +@@ -35198,12 +26022,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -30326,7 +30393,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure done PS1='$ ' PS2='> ' -@@ -35079,7 +25912,89 @@ +@@ -35215,7 +26043,89 @@ LANGUAGE=C export LANGUAGE @@ -30417,7 +30484,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -35093,8 +26008,12 @@ +@@ -35229,8 +26139,12 @@ as_basename=false fi @@ -30431,7 +30498,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -35114,76 +26033,25 @@ +@@ -35250,76 +26164,25 @@ } s/.*/./; q'` @@ -30519,7 +30586,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -35212,8 +26080,56 @@ +@@ -35348,8 +26211,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -30577,7 +30644,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -35232,10 +26148,10 @@ +@@ -35368,10 +26279,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -30590,7 +30657,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -35250,13 +26166,19 @@ +@@ -35386,13 +26297,19 @@ exec 6>&1 @@ -30606,13 +30673,13 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" - This file was extended by gtk+ $as_me 2.19.1, which was + This file was extended by gtk+ $as_me 2.19.2, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -35288,13 +26210,15 @@ +@@ -35424,13 +26341,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -30631,7 +30698,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -35313,16 +26237,17 @@ +@@ -35449,16 +26368,17 @@ Configuration commands: $config_commands @@ -30642,7 +30709,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ - gtk+ config.status 2.19.1 + gtk+ config.status 2.19.2 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, @@ -30653,7 +30720,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -35358,6 +26283,8 @@ +@@ -35494,6 +26414,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; @@ -30662,7 +30729,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -35365,20 +26292,19 @@ +@@ -35501,20 +26423,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -30687,7 +30754,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -35386,11 +26312,10 @@ +@@ -35522,11 +26443,10 @@ ac_cs_silent=: ;; # This is an error. @@ -30702,7 +30769,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_need_defaults=false ;; esac -@@ -35905,9 +26830,7 @@ +@@ -36041,9 +26961,7 @@ "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; @@ -30713,7 +30780,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac done -@@ -35934,7 +26857,7 @@ +@@ -36070,7 +26988,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -30722,7 +30789,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure } # Create a (secure) tmp directory for tmp files. -@@ -35945,11 +26868,7 @@ +@@ -36081,11 +26999,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -30735,7 +30802,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -35957,10 +26876,16 @@ +@@ -36093,10 +27007,16 @@ if test -n "$CONFIG_FILES"; then @@ -30754,7 +30821,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else ac_cs_awk_cr=$ac_cr fi -@@ -35974,24 +26899,18 @@ +@@ -36110,24 +27030,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -30782,7 +30849,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -36013,7 +26932,7 @@ +@@ -36149,7 +27063,7 @@ t delim :nl h @@ -30791,7 +30858,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -36027,7 +26946,7 @@ +@@ -36163,7 +27077,7 @@ t nl :delim h @@ -30800,7 +30867,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p -@@ -36080,9 +26999,7 @@ +@@ -36216,9 +27130,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -30811,7 +30878,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -36123,9 +27040,7 @@ +@@ -36259,9 +27171,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -30822,7 +30889,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -36210,9 +27125,7 @@ +@@ -36346,9 +27256,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -30833,7 +30900,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi # test -n "$CONFIG_HEADERS" -@@ -36225,9 +27138,7 @@ +@@ -36361,9 +27269,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -30844,7 +30911,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -36255,12 +27166,10 @@ +@@ -36391,12 +27297,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -30859,7 +30926,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -36271,7 +27180,7 @@ +@@ -36407,7 +27311,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -30868,7 +30935,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -36284,9 +27193,7 @@ +@@ -36420,9 +27324,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -30879,7 +30946,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac ;; esac -@@ -36314,47 +27221,7 @@ +@@ -36450,47 +27352,7 @@ q } s/.*/./; q'` @@ -30928,7 +30995,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_builddir=. case "$ac_dir" in -@@ -36411,7 +27278,6 @@ +@@ -36547,7 +27409,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -30936,7 +31003,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -36421,12 +27287,11 @@ +@@ -36557,12 +27418,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -30951,7 +31018,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -36436,7 +27301,7 @@ +@@ -36572,7 +27432,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -30960,7 +31027,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure esac _ACEOF -@@ -36465,14 +27330,12 @@ +@@ -36601,14 +27461,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -30977,7 +31044,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -36482,9 +27345,7 @@ +@@ -36618,9 +27476,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -30988,7 +31055,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure ;; :H) # -@@ -36495,25 +27356,19 @@ +@@ -36631,25 +27487,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -31018,7 +31085,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -36551,7 +27406,7 @@ +@@ -36687,7 +27537,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -31027,7 +31094,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -36646,47 +27501,7 @@ +@@ -36782,47 +27632,7 @@ q } s/.*/./; q'` @@ -31076,7 +31143,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done -@@ -37549,7 +28364,7 @@ +@@ -37685,7 +28495,7 @@ if cmp -s $outfile gdk/gdkconfig.h; then @@ -31085,7 +31152,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} rm -f $outfile else -@@ -37561,15 +28376,12 @@ +@@ -37697,15 +28507,12 @@ done # for ac_tag @@ -31103,7 +31170,7 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure # configure is writing to config.log, and then calls config.status. -@@ -37590,10 +28402,10 @@ +@@ -37726,10 +28533,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -31116,11 +31183,17 @@ diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/contrib/gdk-pixbuf-xlib/Makefile.in 2009-12-01 16:03:33.076292670 +0100 -@@ -48,7 +48,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.2/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.19.2.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-12-22 03:42:33.000000000 +0100 ++++ gtk+2.0-2.19.2/contrib/gdk-pixbuf-xlib/Makefile.in 2010-01-04 10:42:31.452520435 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -51,7 +51,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31128,7 +31201,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc CONFIG_CLEAN_VPATH_FILES = -@@ -197,6 +197,7 @@ +@@ -200,6 +200,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@ @@ -31136,7 +31209,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -209,8 +210,6 @@ +@@ -212,8 +213,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31145,7 +31218,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -274,6 +273,7 @@ +@@ -286,6 +285,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31153,11 +31226,17 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefile.in ---- gtk+2.0-2.19.1.old/contrib/Makefile.in 2009-11-30 22:17:30.000000000 +0100 -+++ gtk+2.0-2.19.1/contrib/Makefile.in 2009-12-01 16:03:32.968291942 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/contrib/Makefile.in gtk+2.0-2.19.2/contrib/Makefile.in +--- gtk+2.0-2.19.2.old/contrib/Makefile.in 2009-12-22 03:42:33.000000000 +0100 ++++ gtk+2.0-2.19.2/contrib/Makefile.in 2010-01-04 10:42:31.184524144 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31165,7 +31244,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefil CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -170,6 +170,7 @@ +@@ -173,6 +173,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31173,7 +31252,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -182,8 +183,6 @@ +@@ -185,8 +186,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31182,7 +31261,7 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefil GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -247,6 +246,7 @@ +@@ -259,6 +258,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31190,11 +31269,35 @@ diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefil PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gtk-demo/Makefile.in ---- gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/demos/gtk-demo/Makefile.in 2009-12-01 16:03:33.324292421 +0100 -@@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in +@@ -422,7 +422,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -447,7 +447,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.2/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.19.2.old/demos/gtk-demo/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/demos/gtk-demo/Makefile.in 2010-01-04 10:42:32.012522261 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31202,7 +31305,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gt CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = geninclude.pl CONFIG_CLEAN_VPATH_FILES = -@@ -202,6 +202,7 @@ +@@ -209,6 +209,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31210,7 +31313,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gt GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -214,8 +215,6 @@ +@@ -221,8 +222,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31219,7 +31322,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gt GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -279,6 +278,7 @@ +@@ -295,6 +294,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31227,11 +31330,17 @@ diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gt PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in ---- gtk+2.0-2.19.1.old/demos/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/demos/Makefile.in 2009-12-01 16:03:33.216292029 +0100 -@@ -50,7 +50,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/demos/Makefile.in gtk+2.0-2.19.2/demos/Makefile.in +--- gtk+2.0-2.19.2.old/demos/Makefile.in 2009-12-22 03:42:33.000000000 +0100 ++++ gtk+2.0-2.19.2/demos/Makefile.in 2010-01-04 10:42:31.736521885 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -53,7 +53,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31239,7 +31348,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -220,6 +220,7 @@ +@@ -232,6 +232,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31247,7 +31356,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -232,8 +233,6 @@ +@@ -244,8 +245,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31256,7 +31365,7 @@ diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -297,6 +296,7 @@ +@@ -318,6 +317,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31264,11 +31373,35 @@ diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makefile.in ---- gtk+2.0-2.19.1.old/docs/faq/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/faq/Makefile.in 2009-12-01 16:03:33.520291356 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in +@@ -601,7 +601,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -626,7 +626,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/docs/faq/Makefile.in gtk+2.0-2.19.2/docs/faq/Makefile.in +--- gtk+2.0-2.19.2.old/docs/faq/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/faq/Makefile.in 2010-01-04 10:42:32.384519964 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31276,7 +31409,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makef CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -129,6 +129,7 @@ +@@ -132,6 +132,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31284,7 +31417,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -141,8 +142,6 @@ +@@ -144,8 +145,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31293,7 +31426,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makef GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -206,6 +205,7 @@ +@@ -218,6 +217,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31301,11 +31434,17 @@ diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in ---- gtk+2.0-2.19.1.old/docs/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/Makefile.in 2009-12-01 16:03:33.428292865 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/docs/Makefile.in gtk+2.0-2.19.2/docs/Makefile.in +--- gtk+2.0-2.19.2.old/docs/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/Makefile.in 2010-01-04 10:42:32.204525010 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31313,7 +31452,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -169,6 +169,7 @@ +@@ -172,6 +172,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31321,7 +31460,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -181,8 +182,6 @@ +@@ -184,8 +185,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31330,7 +31469,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -246,6 +245,7 @@ +@@ -258,6 +257,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31338,11 +31477,35 @@ diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs/reference/gdk/Makefile.in ---- gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/reference/gdk/Makefile.in 2009-12-01 16:03:33.860293577 +0100 -@@ -50,7 +50,7 @@ - $(top_srcdir)/configure.in +@@ -425,7 +425,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -450,7 +450,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.2/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.19.2.old/docs/reference/gdk/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/reference/gdk/Makefile.in 2010-01-04 10:42:33.148524036 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -53,7 +53,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31350,7 +31513,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -@@ -136,6 +136,7 @@ +@@ -139,6 +139,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31358,7 +31521,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -148,8 +149,6 @@ +@@ -151,8 +152,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31367,7 +31530,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -213,6 +212,7 @@ +@@ -225,6 +224,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31375,7 +31538,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -480,10 +480,10 @@ +@@ -492,10 +492,10 @@ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -31389,7 +31552,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make -@@ -494,9 +494,7 @@ +@@ -506,9 +506,7 @@ GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ @@ -31400,7 +31563,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs SCANOBJ_FILES = \ $(DOC_MODULE).args \ -@@ -511,10 +509,6 @@ +@@ -523,10 +521,6 @@ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @@ -31411,7 +31574,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs all: all-am .SUFFIXES: -@@ -764,10 +758,10 @@ +@@ -776,10 +770,10 @@ # run make test as part of make check check-local: test @@ -31424,7 +31587,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs $(REPORT_FILES): sgml-build.stamp -@@ -776,9 +770,9 @@ +@@ -788,9 +782,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) @@ -31436,7 +31599,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ cd $(srcdir) ; \ -@@ -786,7 +780,7 @@ +@@ -798,7 +792,7 @@ test -f $$i || touch $$i ; \ done \ fi @@ -31445,7 +31608,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -@@ -796,23 +790,23 @@ +@@ -808,23 +802,23 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo 'gtk-doc: Rebuilding template files' @-chmod -R u+w $(srcdir) @@ -31475,7 +31638,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs sgml.stamp: sgml-build.stamp @true -@@ -822,37 +816,18 @@ +@@ -834,37 +828,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) @@ -31521,7 +31684,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs ############## -@@ -862,14 +837,14 @@ +@@ -874,14 +849,14 @@ distclean-local: cd $(srcdir) && \ @@ -31538,7 +31701,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ -@@ -889,11 +864,12 @@ +@@ -901,11 +876,12 @@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ @@ -31553,7 +31716,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ else \ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@@ -910,14 +886,16 @@ +@@ -922,14 +898,16 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/tmpl @@ -31572,11 +31735,17 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs .PHONY : dist-hook-local docs -diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.19.1.old/docs/reference/gdk-pixbuf/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/reference/gdk-pixbuf/Makefile.in 2009-12-01 16:03:33.760293011 +0100 -@@ -50,7 +50,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19.2/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.19.2.old/docs/reference/gdk-pixbuf/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/reference/gdk-pixbuf/Makefile.in 2010-01-04 10:42:32.920520979 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -53,7 +53,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -31584,745 +31753,6 @@ diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -@@ -161,6 +161,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -173,8 +174,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -238,6 +237,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -423,10 +423,10 @@ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make -@@ -437,9 +437,7 @@ - GPATH = $(srcdir) - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ -- pdf-build.stamp \ -- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ -- $(srcdir)/pdf.stamp -+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ -@@ -454,10 +452,6 @@ - $(DOC_MODULE)-unused.txt - - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp - - ######################################################################## - @ENABLE_MAN_TRUE@man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 -@@ -767,10 +761,10 @@ - # run make test as part of make check - check-local: test - --@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp - @ENABLE_GTK_DOC_FALSE@all-local: - --docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+docs: html-build.stamp - - $(REPORT_FILES): sgml-build.stamp - -@@ -779,9 +773,9 @@ - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) -- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ -@@ -789,7 +783,7 @@ - test -f $$i || touch $$i ; \ - done \ - fi -- @touch scan-build.stamp -+ touch scan-build.stamp - - $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true -@@ -799,23 +793,23 @@ - tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -- @touch tmpl-build.stamp -+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -+ touch tmpl-build.stamp - - tmpl.stamp: tmpl-build.stamp - @true - --$(srcdir)/tmpl/*.sgml: -+tmpl/*.sgml: - @true - - #### xml #### - --sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) -- @touch sgml-build.stamp -+ touch sgml-build.stamp - - sgml.stamp: sgml-build.stamp - @true -@@ -825,37 +819,18 @@ - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/html -- @mkdir $(srcdir)/html -- @mkhtml_options=""; \ -+ rm -rf $(srcdir)/html -+ mkdir $(srcdir)/html -+ mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ -- fi; \ -- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -+ fi -+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' -- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -- @touch html-build.stamp -- --#### pdf #### -- --pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -- @echo 'gtk-doc: Building PDF' -- @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/$(DOC_MODULE).pdf -- @mkpdf_imgdirs=""; \ -- if test "x$(HTML_IMAGES)" != "x"; then \ -- for img in $(HTML_IMAGES); do \ -- part=`dirname $$img`; \ -- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ -- if test $$? != 0; then \ -- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ -- fi; \ -- done; \ -- fi; \ -- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -- @touch pdf-build.stamp -+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -+ touch html-build.stamp - - ############## - -@@ -865,14 +840,14 @@ - - distclean-local: - cd $(srcdir) && \ -- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ -+ rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - - maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - - install-data-local: -- @installfiles=`echo $(srcdir)/html/*`; \ -+ installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -@@ -892,11 +867,12 @@ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ - fi; \ -- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ - fi - - uninstall-local: -- @if test -n "$(DOC_MODULE_VERSION)"; then \ -+ if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@@ -913,14 +889,16 @@ - - dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl -+ mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -+ -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html -- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -diff -Naur gtk+2.0-2.19.1.old/docs/reference/gtk/Makefile.in gtk+2.0-2.19.1/docs/reference/gtk/Makefile.in ---- gtk+2.0-2.19.1.old/docs/reference/gtk/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/reference/gtk/Makefile.in 2009-12-01 16:03:33.976293378 +0100 -@@ -50,7 +50,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = version.xml - CONFIG_CLEAN_VPATH_FILES = -@@ -161,6 +161,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -173,8 +174,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -238,6 +237,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -716,10 +716,10 @@ - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make -@@ -730,9 +730,7 @@ - GPATH = $(srcdir) - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ -- pdf-build.stamp \ -- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ -- $(srcdir)/pdf.stamp -+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ -@@ -747,10 +745,6 @@ - $(DOC_MODULE)-unused.txt - - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp - - ######################################################################## - @ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 -@@ -1060,10 +1054,10 @@ - # run make test as part of make check - check-local: test - --@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp - @ENABLE_GTK_DOC_FALSE@all-local: - --docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+docs: html-build.stamp - - $(REPORT_FILES): sgml-build.stamp - -@@ -1072,9 +1066,9 @@ - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) -- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ -@@ -1082,7 +1076,7 @@ - test -f $$i || touch $$i ; \ - done \ - fi -- @touch scan-build.stamp -+ touch scan-build.stamp - - $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true -@@ -1092,23 +1086,23 @@ - tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -- @touch tmpl-build.stamp -+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -+ touch tmpl-build.stamp - - tmpl.stamp: tmpl-build.stamp - @true - --$(srcdir)/tmpl/*.sgml: -+tmpl/*.sgml: - @true - - #### xml #### - --sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) -- @touch sgml-build.stamp -+ touch sgml-build.stamp - - sgml.stamp: sgml-build.stamp - @true -@@ -1118,37 +1112,18 @@ - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/html -- @mkdir $(srcdir)/html -- @mkhtml_options=""; \ -+ rm -rf $(srcdir)/html -+ mkdir $(srcdir)/html -+ mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ -- fi; \ -- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -+ fi -+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' -- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -- @touch html-build.stamp -- --#### pdf #### -- --pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -- @echo 'gtk-doc: Building PDF' -- @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/$(DOC_MODULE).pdf -- @mkpdf_imgdirs=""; \ -- if test "x$(HTML_IMAGES)" != "x"; then \ -- for img in $(HTML_IMAGES); do \ -- part=`dirname $$img`; \ -- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ -- if test $$? != 0; then \ -- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ -- fi; \ -- done; \ -- fi; \ -- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -- @touch pdf-build.stamp -+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -+ touch html-build.stamp - - ############## - -@@ -1158,14 +1133,14 @@ - - distclean-local: - cd $(srcdir) && \ -- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ -+ rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - - maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - - install-data-local: -- @installfiles=`echo $(srcdir)/html/*`; \ -+ installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -@@ -1185,11 +1160,12 @@ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ - fi; \ -- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ - fi - - uninstall-local: -- @if test -n "$(DOC_MODULE_VERSION)"; then \ -+ if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@@ -1206,14 +1182,16 @@ - - dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl -+ mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -+ -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html -- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -diff -Naur gtk+2.0-2.19.1.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.19.1/docs/reference/libgail-util/Makefile.in ---- gtk+2.0-2.19.1.old/docs/reference/libgail-util/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/reference/libgail-util/Makefile.in 2009-12-01 16:03:34.076293020 +0100 -@@ -49,7 +49,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -135,6 +135,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -147,8 +148,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -212,6 +211,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -360,10 +360,10 @@ - content_files = - HTML_IMAGES = - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make -@@ -374,9 +374,7 @@ - GPATH = $(srcdir) - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ -- pdf-build.stamp \ -- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ -- $(srcdir)/pdf.stamp -+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ -@@ -391,10 +389,6 @@ - $(DOC_MODULE)-unused.txt - - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = --@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp - all: all-am - - .SUFFIXES: -@@ -642,10 +636,10 @@ - # run make test as part of make check - check-local: test - --@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp - @ENABLE_GTK_DOC_FALSE@all-local: - --docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -+docs: html-build.stamp - - $(REPORT_FILES): sgml-build.stamp - -@@ -654,9 +648,9 @@ - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) -- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ -@@ -664,7 +658,7 @@ - test -f $$i || touch $$i ; \ - done \ - fi -- @touch scan-build.stamp -+ touch scan-build.stamp - - $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true -@@ -674,23 +668,23 @@ - tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -- @touch tmpl-build.stamp -+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -+ touch tmpl-build.stamp - - tmpl.stamp: tmpl-build.stamp - @true - --$(srcdir)/tmpl/*.sgml: -+tmpl/*.sgml: - @true - - #### xml #### - --sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) -- @cd $(srcdir) && \ -+ cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) -- @touch sgml-build.stamp -+ touch sgml-build.stamp - - sgml.stamp: sgml-build.stamp - @true -@@ -700,37 +694,18 @@ - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/html -- @mkdir $(srcdir)/html -- @mkhtml_options=""; \ -+ rm -rf $(srcdir)/html -+ mkdir $(srcdir)/html -+ mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ -- fi; \ -- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -+ fi -+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' -- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -- @touch html-build.stamp -- --#### pdf #### -- --pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -- @echo 'gtk-doc: Building PDF' -- @-chmod -R u+w $(srcdir) -- @rm -rf $(srcdir)/$(DOC_MODULE).pdf -- @mkpdf_imgdirs=""; \ -- if test "x$(HTML_IMAGES)" != "x"; then \ -- for img in $(HTML_IMAGES); do \ -- part=`dirname $$img`; \ -- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ -- if test $$? != 0; then \ -- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ -- fi; \ -- done; \ -- fi; \ -- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -- @touch pdf-build.stamp -+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -+ touch html-build.stamp - - ############## - -@@ -740,14 +715,14 @@ - - distclean-local: - cd $(srcdir) && \ -- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ -+ rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - - maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - - install-data-local: -- @installfiles=`echo $(srcdir)/html/*`; \ -+ installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -@@ -767,11 +742,12 @@ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ - fi; \ -- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ - fi - - uninstall-local: -- @if test -n "$(DOC_MODULE_VERSION)"; then \ -+ if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@@ -788,14 +764,16 @@ - - dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl -+ mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -+ -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html -- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html -+ ! which gtkdoc-rebase >/dev/null 2>&1 || \ -+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -diff -Naur gtk+2.0-2.19.1.old/docs/reference/Makefile.in gtk+2.0-2.19.1/docs/reference/Makefile.in ---- gtk+2.0-2.19.1.old/docs/reference/Makefile.in 2009-11-30 22:17:31.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/reference/Makefile.in 2009-12-01 16:03:33.624292693 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -169,6 +169,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -181,8 +182,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -246,6 +245,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/docs/tools/Makefile.in gtk+2.0-2.19.1/docs/tools/Makefile.in ---- gtk+2.0-2.19.1.old/docs/tools/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/tools/Makefile.in 2009-12-01 16:03:34.180293318 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = @@ -164,6 +164,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ @@ -32340,7 +31770,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/tools/Makefile.in gtk+2.0-2.19.1/docs/tools/M GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -241,6 +240,7 @@ +@@ -250,6 +249,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32348,19 +31778,222 @@ diff -Naur gtk+2.0-2.19.1.old/docs/tools/Makefile.in gtk+2.0-2.19.1/docs/tools/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in gtk+2.0-2.19.1/docs/tutorial/Makefile.in ---- gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/docs/tutorial/Makefile.in 2009-12-01 16:03:34.260293153 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in +@@ -435,10 +435,10 @@ + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -449,9 +449,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -466,10 +464,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + ######################################################################## + @ENABLE_MAN_TRUE@man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 +@@ -779,10 +773,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -791,9 +785,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -801,7 +795,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -811,23 +805,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -837,37 +831,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -877,14 +852,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -904,11 +879,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -925,14 +901,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.19.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.19.2/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.19.2.old/docs/reference/gtk/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/reference/gtk/Makefile.in 2010-01-04 10:42:33.368521073 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -53,7 +53,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = + CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -@@ -129,6 +129,7 @@ +@@ -164,6 +164,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@ @@ -32368,7 +32001,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in gtk+2.0-2.19.1/docs/tuto GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -141,8 +142,6 @@ +@@ -176,8 +177,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32377,7 +32010,7 @@ diff -Naur gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in gtk+2.0-2.19.1/docs/tuto GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -206,6 +205,7 @@ +@@ -250,6 +249,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32385,11 +32018,214 @@ diff -Naur gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in gtk+2.0-2.19.1/docs/tuto PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/directfb/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/directfb/Makefile.in 2009-12-01 16:03:34.952291376 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +@@ -728,10 +728,10 @@ + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -742,9 +742,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -759,10 +757,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + ######################################################################## + @ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 +@@ -1072,10 +1066,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -1084,9 +1078,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -1094,7 +1088,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -1104,23 +1098,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -1130,37 +1124,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -1170,14 +1145,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -1197,11 +1172,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -1218,14 +1194,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.19.2.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.19.2/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.19.2.old/docs/reference/libgail-util/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/reference/libgail-util/Makefile.in 2010-01-04 10:42:33.588520810 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -52,7 +52,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32397,7 +32233,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/direct CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -193,6 +193,7 @@ +@@ -138,6 +138,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@ @@ -32405,7 +32241,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/direct GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -205,8 +206,6 @@ +@@ -150,8 +151,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32414,7 +32250,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/direct GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -270,6 +269,7 @@ +@@ -224,6 +223,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32422,11 +32258,214 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/direct PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/Makefile.in 2009-12-01 16:03:34.844291751 +0100 +@@ -372,10 +372,10 @@ + content_files = + HTML_IMAGES = + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -386,9 +386,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -403,10 +401,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + all: all-am + + .SUFFIXES: +@@ -654,10 +648,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -666,9 +660,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -676,7 +670,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -686,23 +680,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -712,37 +706,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -752,14 +727,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -779,11 +754,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -800,14 +776,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.19.2.old/docs/reference/Makefile.in gtk+2.0-2.19.2/docs/reference/Makefile.in +--- gtk+2.0-2.19.2.old/docs/reference/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/reference/Makefile.in 2010-01-04 10:42:32.604523261 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32434,7 +32473,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -315,6 +315,7 @@ +@@ -172,6 +172,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32442,7 +32481,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -327,8 +328,6 @@ +@@ -184,8 +185,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32451,7 +32490,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -392,6 +391,7 @@ +@@ -258,6 +257,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32459,11 +32498,35 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/quartz/Makefile.in 2009-12-01 16:03:35.060291128 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +@@ -422,7 +422,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -447,7 +447,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/docs/tools/Makefile.in gtk+2.0-2.19.2/docs/tools/Makefile.in +--- gtk+2.0-2.19.2.old/docs/tools/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/tools/Makefile.in 2010-01-04 10:42:33.868526101 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32471,7 +32534,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/M CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -192,6 +192,7 @@ +@@ -168,6 +168,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32479,7 +32542,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -204,8 +205,6 @@ +@@ -180,8 +181,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32488,7 +32551,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/M GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -269,6 +268,7 @@ +@@ -254,6 +253,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32496,11 +32559,17 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/tests/Makefile.in gtk+2.0-2.19.1/gdk/tests/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/tests/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/tests/Makefile.in 2009-12-01 16:03:35.144291534 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/docs/tutorial/Makefile.in gtk+2.0-2.19.2/docs/tutorial/Makefile.in +--- gtk+2.0-2.19.2.old/docs/tutorial/Makefile.in 2009-12-22 03:42:34.000000000 +0100 ++++ gtk+2.0-2.19.2/docs/tutorial/Makefile.in 2010-01-04 10:42:34.068522668 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32508,6 +32577,300 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/tests/Makefile.in gtk+2.0-2.19.1/gdk/tests/Mak CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@@ -132,6 +132,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -144,8 +145,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -218,6 +217,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/gdk/directfb/Makefile.in gtk+2.0-2.19.2/gdk/directfb/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/directfb/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/directfb/Makefile.in 2010-01-04 10:42:35.472524304 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -196,6 +196,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -208,8 +209,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -282,6 +281,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/gdk/Makefile.in gtk+2.0-2.19.2/gdk/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/Makefile.in 2010-01-04 10:42:35.116523738 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -52,7 +52,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -323,6 +323,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -335,8 +336,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -409,6 +408,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +@@ -940,7 +940,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -965,7 +965,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/gdk/quartz/Makefile.in gtk+2.0-2.19.2/gdk/quartz/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/quartz/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/quartz/Makefile.in 2010-01-04 10:42:37.252521885 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -195,6 +195,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -207,8 +208,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -281,6 +280,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/gdk/tests/Makefile.in gtk+2.0-2.19.2/gdk/tests/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/tests/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/tests/Makefile.in 2010-01-04 10:42:37.772521221 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -137,6 +137,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -149,8 +150,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -223,6 +222,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/gdk/win32/Makefile.in gtk+2.0-2.19.2/gdk/win32/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/win32/Makefile.in 2009-12-22 03:42:36.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/win32/Makefile.in 2010-01-04 10:42:38.148520545 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -233,6 +233,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -245,8 +246,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -319,6 +318,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +@@ -625,7 +625,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -650,7 +650,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.19.2/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/win32/rc/Makefile.in 2009-12-22 03:42:36.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/win32/rc/Makefile.in 2010-01-04 10:42:38.264521954 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = gdk.rc + CONFIG_CLEAN_VPATH_FILES = @@ -134,6 +134,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ @@ -32525,7 +32888,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/tests/Makefile.in gtk+2.0-2.19.1/gdk/tests/Mak GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -211,6 +210,7 @@ +@@ -220,6 +219,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32533,11 +32896,17 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/tests/Makefile.in gtk+2.0-2.19.1/gdk/tests/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/win32/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/win32/Makefile.in 2009-12-01 16:03:35.268293471 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/gdk/x11/Makefile.in gtk+2.0-2.19.2/gdk/x11/Makefile.in +--- gtk+2.0-2.19.2.old/gdk/x11/Makefile.in 2009-12-22 03:42:36.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk/x11/Makefile.in 2010-01-04 10:42:38.424521697 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -53,7 +53,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32545,7 +32914,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Mak CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -230,6 +230,7 @@ +@@ -225,6 +225,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32553,7 +32922,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -242,8 +243,6 @@ +@@ -237,8 +238,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32562,7 +32931,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Mak GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -307,6 +306,7 @@ +@@ -311,6 +310,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32570,85 +32939,17 @@ diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/win32/rc/Makefile.in gtk+2.0-2.19.1/gdk/win32/rc/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/win32/rc/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/win32/rc/Makefile.in 2009-12-01 16:03:35.356293279 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = gdk.rc - CONFIG_CLEAN_VPATH_FILES = -@@ -131,6 +131,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -143,8 +144,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -208,6 +207,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk/x11/Makefile.in gtk+2.0-2.19.1/gdk/x11/Makefile.in ---- gtk+2.0-2.19.1.old/gdk/x11/Makefile.in 2009-11-30 22:17:34.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk/x11/Makefile.in 2009-12-01 16:03:35.500291749 +0100 -@@ -50,7 +50,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -222,6 +222,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -234,8 +235,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -299,6 +298,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in 2009-11-30 22:17:32.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk-pixbuf/Makefile.in 2009-12-01 16:03:34.568293611 +0100 -@@ -52,7 +52,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.2/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.19.2.old/gdk-pixbuf/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk-pixbuf/Makefile.in 2010-01-04 10:42:34.740523651 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -58,7 +58,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32656,7 +32957,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h CONFIG_CLEAN_VPATH_FILES = -@@ -772,6 +772,7 @@ +@@ -781,6 +781,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@ @@ -32664,7 +32965,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -784,8 +785,6 @@ +@@ -793,8 +794,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32673,7 +32974,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -849,6 +848,7 @@ +@@ -867,6 +866,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32681,7 +32982,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -981,6 +981,7 @@ +@@ -1000,6 +1000,7 @@ libgdk_pixbuf-2.0.la loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders @@ -32689,7 +32990,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) # -@@ -1352,7 +1353,7 @@ +@@ -1371,7 +1372,7 @@ $(GDK_PIXBUF_DEP_CFLAGS) \ -DGDK_PIXBUF_ENABLE_BACKEND @@ -32698,11 +32999,35 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/M LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) test_gdk_pixbuf_LDADD = $(LDADDS) gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/pixops/Makefile.in ---- gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in 2009-11-30 22:17:33.000000000 +0100 -+++ gtk+2.0-2.19.1/gdk-pixbuf/pixops/Makefile.in 2009-12-01 16:03:34.684292428 +0100 -@@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in +@@ -1874,7 +1875,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -1899,7 +1900,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.2/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.19.2.old/gdk-pixbuf/pixops/Makefile.in 2009-12-22 03:42:35.000000000 +0100 ++++ gtk+2.0-2.19.2/gdk-pixbuf/pixops/Makefile.in 2010-01-04 10:42:34.900522417 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32710,7 +33035,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-p CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -182,6 +182,7 @@ +@@ -185,6 +185,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@ @@ -32718,7 +33043,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-p GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -194,8 +195,6 @@ +@@ -197,8 +198,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32727,7 +33052,7 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-p GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -259,6 +258,7 @@ +@@ -271,6 +270,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32735,11 +33060,17 @@ diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-p PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in ---- gtk+2.0-2.19.1.old/gtk/Makefile.in 2009-11-30 22:56:45.000000000 +0100 -+++ gtk+2.0-2.19.1/gtk/Makefile.in 2009-12-01 16:03:35.880314279 +0100 -@@ -79,7 +79,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/gtk/Makefile.in gtk+2.0-2.19.2/gtk/Makefile.in +--- gtk+2.0-2.19.2.old/gtk/Makefile.in 2009-12-22 03:42:36.000000000 +0100 ++++ gtk+2.0-2.19.2/gtk/Makefile.in 2010-01-04 10:42:38.904523346 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -84,7 +84,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32747,7 +33078,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc CONFIG_CLEAN_VPATH_FILES = -@@ -733,6 +733,7 @@ +@@ -741,6 +741,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@ @@ -32755,7 +33086,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -745,8 +746,6 @@ +@@ -753,8 +754,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32764,7 +33095,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -810,6 +809,7 @@ +@@ -827,6 +826,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32772,7 +33103,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -963,6 +963,8 @@ +@@ -989,6 +989,8 @@ -I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_DISABLE_DEPRECATED \ @@ -32781,7 +33112,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -@@ -1075,17 +1077,21 @@ +@@ -1101,17 +1103,21 @@ # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ @@ -32811,11 +33142,35 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \ gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \ gtkrbtree.h gtkrecentchooserdefault.h \ -diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Makefile.in ---- gtk+2.0-2.19.1.old/gtk/tests/Makefile.in 2009-11-30 22:17:34.000000000 +0100 -+++ gtk+2.0-2.19.1/gtk/tests/Makefile.in 2009-12-01 16:03:36.036294645 +0100 -@@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in +@@ -2194,7 +2200,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -2219,7 +2225,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/gtk/tests/Makefile.in gtk+2.0-2.19.2/gtk/tests/Makefile.in +--- gtk+2.0-2.19.2.old/gtk/tests/Makefile.in 2009-12-22 03:42:36.000000000 +0100 ++++ gtk+2.0-2.19.2/gtk/tests/Makefile.in 2010-01-04 10:42:39.072523177 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32823,7 +33178,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Mak CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -216,6 +216,7 @@ +@@ -223,6 +223,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32831,7 +33186,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -228,8 +229,6 @@ +@@ -235,8 +236,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32840,7 +33195,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Mak GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -293,6 +292,7 @@ +@@ -309,6 +308,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32848,11 +33203,17 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/theme-bits/Makefile.in ---- gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in 2009-11-30 22:17:34.000000000 +0100 -+++ gtk+2.0-2.19.1/gtk/theme-bits/Makefile.in 2009-12-01 16:03:36.136291215 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.2/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.19.2.old/gtk/theme-bits/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/gtk/theme-bits/Makefile.in 2010-01-04 10:42:39.184523657 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -32860,7 +33221,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/them CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -160,6 +160,7 @@ +@@ -165,6 +165,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32868,7 +33229,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/them GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -172,8 +173,6 @@ +@@ -177,8 +178,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -32877,7 +33238,7 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/them GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -237,6 +236,7 @@ +@@ -251,6 +250,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -32885,9 +33246,9 @@ diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/them PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/gtk-doc.make gtk+2.0-2.19.1/gtk-doc.make ---- gtk+2.0-2.19.1.old/gtk-doc.make 2009-11-30 05:33:42.000000000 +0100 -+++ gtk+2.0-2.19.1/gtk-doc.make 2009-12-01 16:03:26.483397214 +0100 +diff -Naur gtk+2.0-2.19.2.old/gtk-doc.make gtk+2.0-2.19.2/gtk-doc.make +--- gtk+2.0-2.19.2.old/gtk-doc.make 2009-12-21 16:00:56.000000000 +0100 ++++ gtk+2.0-2.19.2/gtk-doc.make 2010-01-04 10:42:15.449521032 +0100 @@ -5,13 +5,13 @@ #################################### @@ -33090,15 +33451,15 @@ diff -Naur gtk+2.0-2.19.1.old/gtk-doc.make gtk+2.0-2.19.1/gtk-doc.make + gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs -diff -Naur gtk+2.0-2.19.1.old/ltmain.sh gtk+2.0-2.19.1/ltmain.sh ---- gtk+2.0-2.19.1.old/ltmain.sh 2009-10-19 14:18:27.000000000 +0200 -+++ gtk+2.0-2.19.1/ltmain.sh 2009-12-01 16:03:25.880303314 +0100 +diff -Naur gtk+2.0-2.19.2.old/ltmain.sh gtk+2.0-2.19.2/ltmain.sh +--- gtk+2.0-2.19.2.old/ltmain.sh 2009-12-02 12:35:38.000000000 +0100 ++++ gtk+2.0-2.19.2/ltmain.sh 2010-01-04 10:42:14.597521667 +0100 @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6 -+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +-# $progname: (GNU libtool) 2.2.6b ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 # automake: $automake_version # autoconf: $autoconf_version # @@ -33106,10 +33467,10 @@ diff -Naur gtk+2.0-2.19.1.old/ltmain.sh gtk+2.0-2.19.1/ltmain.sh PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=2.2.6 -+VERSION="2.2.6 Debian-2.2.6a-4" +-VERSION=2.2.6b ++VERSION="2.2.6b Debian-2.2.6b-2" TIMESTAMP="" - package_revision=1.3012 + package_revision=1.3017 @@ -5033,7 +5033,10 @@ case $pass in @@ -33171,11 +33532,225 @@ diff -Naur gtk+2.0-2.19.1.old/ltmain.sh gtk+2.0-2.19.1/ltmain.sh esac ;; no) -diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makefile.in ---- gtk+2.0-2.19.1.old/m4macros/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/m4macros/Makefile.in 2009-12-01 16:03:36.220291350 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/m4/gtk-doc.m4 gtk+2.0-2.19.2/m4/gtk-doc.m4 +--- gtk+2.0-2.19.2.old/m4/gtk-doc.m4 2009-12-21 16:00:56.000000000 +0100 ++++ gtk+2.0-2.19.2/m4/gtk-doc.m4 2010-01-04 10:42:15.417521784 +0100 +@@ -8,12 +8,6 @@ + [ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- +- dnl check for tools we added during development +- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) +- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) +- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) +- + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, +@@ -32,30 +26,14 @@ + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + +- dnl enable/disable output formats +- AC_ARG_ENABLE([gtk-doc-html], +- AS_HELP_STRING([--enable-gtk-doc-html], +- [build documentation in html format [[default=yes]]]),, +- [enable_gtk_doc_html=yes]) +- AC_ARG_ENABLE([gtk-doc-pdf], +- AS_HELP_STRING([--enable-gtk-doc-pdf], +- [build documentation in pdf format [[default=no]]]),, +- [enable_gtk_doc_pdf=no]) +- +- if test -z "$GTKDOC_MKPDF"; then +- enable_gtk_doc_pdf=no +- fi +- ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) +- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) +- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) + ]) +diff -Naur gtk+2.0-2.19.2.old/m4/libtool.m4 gtk+2.0-2.19.2/m4/libtool.m4 +--- gtk+2.0-2.19.2.old/m4/libtool.m4 2009-12-02 12:35:38.000000000 +0100 ++++ gtk+2.0-2.19.2/m4/libtool.m4 2010-01-04 10:42:14.685522031 +0100 +@@ -2445,7 +2445,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2470,13 +2470,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2488,6 +2485,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -3075,11 +3084,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + 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 +@@ -3696,7 +3705,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -3760,7 +3769,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -3980,7 +3989,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -4185,6 +4194,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4249,6 +4261,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4270,6 +4285,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -4361,7 +4377,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -4431,7 +4447,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -4606,6 +4622,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -4844,7 +4861,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + 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 +@@ -5844,7 +5861,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +diff -Naur gtk+2.0-2.19.2.old/m4macros/Makefile.in gtk+2.0-2.19.2/m4macros/Makefile.in +--- gtk+2.0-2.19.2.old/m4macros/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/m4macros/Makefile.in 2010-01-04 10:42:39.280521195 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33183,7 +33758,7 @@ diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makef CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -153,6 +153,7 @@ +@@ -156,6 +156,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33191,7 +33766,7 @@ diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -165,8 +166,6 @@ +@@ -168,8 +169,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33200,7 +33775,7 @@ diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makef GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -230,6 +229,7 @@ +@@ -242,6 +241,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33208,9 +33783,15 @@ diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in ---- gtk+2.0-2.19.1.old/Makefile.in 2009-11-30 22:17:38.000000000 +0100 -+++ gtk+2.0-2.19.1/Makefile.in 2009-12-01 16:03:38.860291552 +0100 +diff -Naur gtk+2.0-2.19.2.old/Makefile.in gtk+2.0-2.19.2/Makefile.in +--- gtk+2.0-2.19.2.old/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/Makefile.in 2010-01-04 10:42:45.396522956 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -47,7 +47,7 @@ $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \ @@ -33220,7 +33801,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in @OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -57,7 +57,7 @@ +@@ -60,7 +60,7 @@ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno @@ -33229,7 +33810,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ -@@ -109,7 +109,8 @@ +@@ -112,7 +112,8 @@ distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags @@ -33239,7 +33820,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) -@@ -219,6 +220,7 @@ +@@ -222,6 +223,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33247,7 +33828,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -231,8 +233,6 @@ +@@ -234,8 +236,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33256,7 +33837,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -296,6 +296,7 @@ +@@ -308,6 +308,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33264,7 +33845,7 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -466,7 +467,10 @@ +@@ -478,7 +479,10 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -33276,9 +33857,59 @@ diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 -diff -Naur gtk+2.0-2.19.1.old/mkinstalldirs gtk+2.0-2.19.1/mkinstalldirs ---- gtk+2.0-2.19.1.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 -+++ gtk+2.0-2.19.1/mkinstalldirs 2009-12-01 16:03:38.783318005 +0100 +@@ -645,7 +649,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -670,7 +674,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -837,8 +841,7 @@ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -882,17 +885,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +diff -Naur gtk+2.0-2.19.2.old/mkinstalldirs gtk+2.0-2.19.2/mkinstalldirs +--- gtk+2.0-2.19.2.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 ++++ gtk+2.0-2.19.2/mkinstalldirs 2010-01-04 10:42:45.328521224 +0100 @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy @@ -33442,300 +34073,17 @@ diff -Naur gtk+2.0-2.19.1.old/mkinstalldirs gtk+2.0-2.19.1/mkinstalldirs +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -diff -Naur gtk+2.0-2.19.1.old/modules/engines/Makefile.in gtk+2.0-2.19.1/modules/engines/Makefile.in ---- gtk+2.0-2.19.1.old/modules/engines/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/engines/Makefile.in 2009-12-01 16:03:36.388291621 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -169,6 +169,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -181,8 +182,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -246,6 +245,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Makefile.in ---- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/engines/ms-windows/Makefile.in 2009-12-01 16:03:36.496292777 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -227,6 +227,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -239,8 +240,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -304,6 +303,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-12-01 16:03:36.664293307 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -153,6 +153,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -165,8 +166,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -230,6 +229,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/Makefile.in 2009-12-01 16:03:36.580292830 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -169,6 +169,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -181,8 +182,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -246,6 +245,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.19.1/modules/engines/pixbuf/Makefile.in ---- gtk+2.0-2.19.1.old/modules/engines/pixbuf/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/engines/pixbuf/Makefile.in 2009-12-01 16:03:36.768291793 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -190,6 +190,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -202,8 +203,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -267,6 +266,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/input/Makefile.in gtk+2.0-2.19.1/modules/input/Makefile.in ---- gtk+2.0-2.19.1.old/modules/input/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/input/Makefile.in 2009-12-01 16:03:36.972293359 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -391,6 +391,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -403,8 +404,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -468,6 +467,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -704,7 +704,8 @@ - @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la - imconffiledir = $(sysconfdir)/gtk-2.0 - dist_imconffile_DATA = im-multipress.conf --@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" -+@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" -+@CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false - @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false - @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ -@@ -1256,7 +1257,18 @@ - included-modules: $(noinst_LTLIBRARIES) +diff -Naur gtk+2.0-2.19.2.old/modules/engines/Makefile.in gtk+2.0-2.19.2/modules/engines/Makefile.in +--- gtk+2.0-2.19.2.old/modules/engines/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/engines/Makefile.in 2010-01-04 10:42:39.512521144 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ - gtk.immodules: Makefile.am $(module_LTLIBRARIES) -- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules -+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ -+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ -+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ -+ else \ -+ echo "***" ; \ -+ echo "*** Warning: gtk.immodules not built" ; \ -+ echo "***" ; \ -+ echo "*** Generate this file manually on host" ; \ -+ echo "*** system using gtk-query-immodules-2.0" ; \ -+ echo "***" ; \ -+ touch gtk.immodules; \ -+ fi - - @CROSS_COMPILING_FALSE@all-local: gtk.immodules - -diff -Naur gtk+2.0-2.19.1.old/modules/Makefile.in gtk+2.0-2.19.1/modules/Makefile.in ---- gtk+2.0-2.19.1.old/modules/Makefile.in 2009-11-30 22:17:35.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/Makefile.in 2009-12-01 16:03:36.308292899 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) --mkinstalldirs = $(install_sh) -d -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -@@ -170,6 +170,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -182,8 +183,6 @@ - GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - GTKDOC_CHECK = @GTKDOC_CHECK@ --GTKDOC_MKPDF = @GTKDOC_MKPDF@ --GTKDOC_REBASE = @GTKDOC_REBASE@ - GTK_API_VERSION = @GTK_API_VERSION@ - GTK_BINARY_AGE = @GTK_BINARY_AGE@ - GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -247,6 +246,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.19.1/modules/other/gail/libgail-util/Makefile.in ---- gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in 2009-11-30 22:17:36.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/other/gail/libgail-util/Makefile.in 2009-12-01 16:03:37.536291084 +0100 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33743,7 +34091,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2. CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -194,6 +194,7 @@ +@@ -172,6 +172,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33751,7 +34099,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -206,8 +207,6 @@ +@@ -184,8 +185,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33760,7 +34108,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2. GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -271,6 +270,7 @@ +@@ -258,6 +257,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33768,11 +34116,35 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modules/other/gail/Makefile.in ---- gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in 2009-11-30 22:17:36.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/other/gail/Makefile.in 2009-12-01 16:03:37.416291619 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +@@ -422,7 +422,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -447,7 +447,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.19.2/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.19.2.old/modules/engines/ms-windows/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/engines/ms-windows/Makefile.in 2010-01-04 10:42:39.796521903 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33780,7 +34152,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modu CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -261,6 +261,7 @@ +@@ -230,6 +230,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33788,7 +34160,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modu GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -273,8 +274,6 @@ +@@ -242,8 +243,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33797,7 +34169,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modu GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -338,6 +337,7 @@ +@@ -316,6 +315,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33805,11 +34177,35 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modu PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19.1/modules/other/gail/tests/Makefile.in ---- gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in 2009-11-30 22:17:36.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/other/gail/tests/Makefile.in 2009-12-01 16:03:37.700291319 +0100 -@@ -44,7 +44,7 @@ - $(top_srcdir)/configure.in +@@ -577,7 +577,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -602,7 +602,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.19.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.19.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-01-04 10:42:40.168520435 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33817,7 +34213,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19. CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -333,6 +333,7 @@ +@@ -156,6 +156,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33825,7 +34221,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -345,8 +346,6 @@ +@@ -168,8 +169,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33834,7 +34230,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19. GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -410,6 +409,7 @@ +@@ -242,6 +241,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33842,11 +34238,17 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/other/Makefile.in ---- gtk+2.0-2.19.1.old/modules/other/Makefile.in 2009-11-30 22:17:36.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/other/Makefile.in 2009-12-01 16:03:37.060291827 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.19.2/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.19.2.old/modules/engines/ms-windows/Theme/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/engines/ms-windows/Theme/Makefile.in 2010-01-04 10:42:40.004523969 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33854,7 +34256,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/o CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -169,6 +169,7 @@ +@@ -172,6 +172,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33862,7 +34264,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/o GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -181,8 +182,6 @@ +@@ -184,8 +185,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33871,7 +34273,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/o GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -246,6 +245,7 @@ +@@ -258,6 +257,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33879,11 +34281,35 @@ diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/o PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.19.1/modules/printbackends/cups/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/cups/Makefile.in 2009-12-01 16:03:37.892291570 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +@@ -421,7 +421,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -446,7 +446,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.19.2/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.19.2.old/modules/engines/pixbuf/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/engines/pixbuf/Makefile.in 2010-01-04 10:42:40.328520387 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33908,7 +34334,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -270,6 +269,7 @@ +@@ -279,6 +278,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33916,11 +34342,17 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.19.1/modules/printbackends/file/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/file/Makefile.in 2009-12-01 16:03:38.004294771 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/modules/input/Makefile.in gtk+2.0-2.19.2/modules/input/Makefile.in +--- gtk+2.0-2.19.2.old/modules/input/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/input/Makefile.in 2010-01-04 10:42:42.296518895 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33928,7 +34360,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -192,6 +192,7 @@ +@@ -394,6 +394,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33936,7 +34368,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -204,8 +205,6 @@ +@@ -406,8 +407,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33945,7 +34377,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -269,6 +268,7 @@ +@@ -480,6 +479,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33953,11 +34385,47 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19.1/modules/printbackends/lpr/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/lpr/Makefile.in 2009-12-01 16:03:38.108292755 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +@@ -716,7 +716,8 @@ + @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la + imconffiledir = $(sysconfdir)/gtk-2.0 + dist_imconffile_DATA = im-multipress.conf +-@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false + @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false + @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ +@@ -1268,7 +1269,18 @@ + included-modules: $(noinst_LTLIBRARIES) + + gtk.immodules: Makefile.am $(module_LTLIBRARIES) +- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ ++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ ++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ ++ else \ ++ echo "***" ; \ ++ echo "*** Warning: gtk.immodules not built" ; \ ++ echo "***" ; \ ++ echo "*** Generate this file manually on host" ; \ ++ echo "*** system using gtk-query-immodules-2.0" ; \ ++ echo "***" ; \ ++ touch gtk.immodules; \ ++ fi + + @CROSS_COMPILING_FALSE@all-local: gtk.immodules + +diff -Naur gtk+2.0-2.19.2.old/modules/Makefile.in gtk+2.0-2.19.2/modules/Makefile.in +--- gtk+2.0-2.19.2.old/modules/Makefile.in 2009-12-22 03:42:37.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/Makefile.in 2010-01-04 10:42:39.408520711 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -33965,7 +34433,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -190,6 +190,7 @@ +@@ -173,6 +173,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33973,7 +34441,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -202,8 +203,6 @@ +@@ -185,8 +186,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -33982,7 +34450,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -267,6 +266,7 @@ +@@ -259,6 +258,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -33990,11 +34458,182 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/modules/printbackends/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in 2009-11-30 22:17:36.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/Makefile.in 2009-12-01 16:03:37.784290964 +0100 +@@ -422,7 +422,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -447,7 +447,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.19.2/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.19.2.old/modules/other/gail/libgail-util/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/other/gail/libgail-util/Makefile.in 2010-01-04 10:42:43.044519759 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -197,6 +197,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -209,8 +210,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -283,6 +282,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/modules/other/gail/Makefile.in gtk+2.0-2.19.2/modules/other/gail/Makefile.in +--- gtk+2.0-2.19.2.old/modules/other/gail/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/other/gail/Makefile.in 2010-01-04 10:42:42.900520670 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -264,6 +264,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -276,8 +277,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -350,6 +349,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +@@ -1264,7 +1264,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -1289,7 +1289,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19.2/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.19.2.old/modules/other/gail/tests/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/other/gail/tests/Makefile.in 2010-01-04 10:42:43.308520915 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -336,6 +336,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -348,8 +349,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -422,6 +421,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/modules/other/Makefile.in gtk+2.0-2.19.2/modules/other/Makefile.in +--- gtk+2.0-2.19.2.old/modules/other/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/other/Makefile.in 2010-01-04 10:42:42.408523291 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ - $(top_srcdir)/configure.in + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -34002,7 +34641,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/m CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -171,6 +171,7 @@ +@@ -172,6 +172,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34010,7 +34649,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/m GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -183,8 +184,6 @@ +@@ -184,8 +185,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -34019,7 +34658,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/m GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -248,6 +247,7 @@ +@@ -258,6 +257,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -34027,11 +34666,35 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/m PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.19.1/modules/printbackends/papi/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/papi/Makefile.in 2009-12-01 16:03:38.212291381 +0100 -@@ -43,7 +43,7 @@ - $(top_srcdir)/configure.in +@@ -421,7 +421,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -446,7 +446,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.19.2/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/cups/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/cups/Makefile.in 2010-01-04 10:42:43.680520702 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -34039,7 +34702,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.1 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -190,6 +190,7 @@ +@@ -196,6 +196,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34047,7 +34710,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -202,8 +203,6 @@ +@@ -208,8 +209,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -34056,7 +34719,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.1 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -267,6 +266,7 @@ +@@ -282,6 +281,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -34064,11 +34727,17 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.19.1/modules/printbackends/test/Makefile.in ---- gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/modules/printbackends/test/Makefile.in 2009-12-01 16:03:38.320297220 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.19.2/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/file/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/file/Makefile.in 2010-01-04 10:42:43.816521094 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -34076,7 +34745,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -191,6 +191,7 @@ +@@ -195,6 +195,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34084,7 +34753,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -203,8 +204,6 @@ +@@ -207,8 +208,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -34093,7 +34762,7 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -268,6 +267,7 @@ +@@ -281,6 +280,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -34101,11 +34770,17 @@ diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in ---- gtk+2.0-2.19.1.old/perf/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/perf/Makefile.in 2009-12-01 16:03:38.424291728 +0100 -@@ -45,7 +45,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19.2/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/lpr/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/lpr/Makefile.in 2010-01-04 10:42:44.068524623 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -34113,7 +34788,7 @@ diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -161,6 +161,7 @@ +@@ -193,6 +193,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34121,7 +34796,7 @@ diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -173,8 +174,6 @@ +@@ -205,8 +206,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -34130,7 +34805,7 @@ diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -238,6 +237,7 @@ +@@ -279,6 +278,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -34138,9 +34813,199 @@ diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.19.1.old/po/Makefile.in.in gtk+2.0-2.19.1/po/Makefile.in.in ---- gtk+2.0-2.19.1.old/po/Makefile.in.in 2009-10-09 07:00:46.000000000 +0200 -+++ gtk+2.0-2.19.1/po/Makefile.in.in 2009-12-01 16:03:26.427322770 +0100 +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/Makefile.in gtk+2.0-2.19.2/modules/printbackends/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/Makefile.in 2009-12-22 03:42:38.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/Makefile.in 2010-01-04 10:42:43.460521173 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -174,6 +174,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -186,8 +187,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -260,6 +259,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +@@ -424,7 +424,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -449,7 +449,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @fail= failcom='exit 1'; \ ++ @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.19.2/modules/printbackends/papi/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/papi/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/papi/Makefile.in 2010-01-04 10:42:44.188523116 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -193,6 +193,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -205,8 +206,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -279,6 +278,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.19.2/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.19.2.old/modules/printbackends/test/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/modules/printbackends/test/Makefile.in 2010-01-04 10:42:44.484523035 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -194,6 +194,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -206,8 +207,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -280,6 +279,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/perf/Makefile.in gtk+2.0-2.19.2/perf/Makefile.in +--- gtk+2.0-2.19.2.old/perf/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/perf/Makefile.in 2010-01-04 10:42:44.664524744 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = +@@ -168,6 +168,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -180,8 +181,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -254,6 +253,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +diff -Naur gtk+2.0-2.19.2.old/po/Makefile.in.in gtk+2.0-2.19.2/po/Makefile.in.in +--- gtk+2.0-2.19.2.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100 ++++ gtk+2.0-2.19.2/po/Makefile.in.in 2010-01-04 10:42:15.377522217 +0100 @@ -25,22 +25,23 @@ prefix = @prefix@ @@ -34252,11 +35117,17 @@ diff -Naur gtk+2.0-2.19.1.old/po/Makefile.in.in gtk+2.0-2.19.1/po/Makefile.in.in $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ -diff -Naur gtk+2.0-2.19.1.old/tests/Makefile.in gtk+2.0-2.19.1/tests/Makefile.in ---- gtk+2.0-2.19.1.old/tests/Makefile.in 2009-11-30 22:17:37.000000000 +0100 -+++ gtk+2.0-2.19.1/tests/Makefile.in 2009-12-01 16:03:38.684292497 +0100 -@@ -79,7 +79,7 @@ - $(top_srcdir)/configure.in +diff -Naur gtk+2.0-2.19.2.old/tests/Makefile.in gtk+2.0-2.19.2/tests/Makefile.in +--- gtk+2.0-2.19.2.old/tests/Makefile.in 2009-12-22 03:42:39.000000000 +0100 ++++ gtk+2.0-2.19.2/tests/Makefile.in 2010-01-04 10:42:45.108520417 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -82,7 +82,7 @@ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d @@ -34264,7 +35135,7 @@ diff -Naur gtk+2.0-2.19.1.old/tests/Makefile.in gtk+2.0-2.19.1/tests/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -423,6 +423,7 @@ +@@ -430,6 +430,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@ @@ -34272,7 +35143,7 @@ diff -Naur gtk+2.0-2.19.1.old/tests/Makefile.in gtk+2.0-2.19.1/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -435,8 +436,6 @@ +@@ -442,8 +443,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -34281,7 +35152,7 @@ diff -Naur gtk+2.0-2.19.1.old/tests/Makefile.in gtk+2.0-2.19.1/tests/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -500,6 +499,7 @@ +@@ -516,6 +515,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ diff --git a/debian/rules b/debian/rules index 404a1f3b4b..13029e3e47 100644 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') APIVER := 2.0 SONAME := 0 -SHVER := 2.19.1 +SHVER := 2.19.2 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0