gtk+: update to upstream version 2.24.15

- configure-nm.patch updated to apply
- hardcoded_libtool.patch updated to apply
- obsolete_automake_macros.patch removes as it's now part of upstream

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

15 files changed, 1825 insertions, 63 deletions

diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.14/hardcoded_libtool.patch
deleted file mode 100644
index e32ce3fb1c..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/hardcoded_libtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: gtk+-2.23.2/configure.in
-===================================================================
---- gtk+-2.23.2.orig/configure.in	2010-11-10 22:22:47.000000000 +0800
-+++ gtk+-2.23.2/configure.in	2010-11-25 13:32:40.000000000 +0800
-@@ -414,7 +414,7 @@
- case $enable_explicit_deps in
-   auto)
-     export SED
--    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -773,7 +773,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
-         module_deplibs_check=`$module_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1555,7 +1555,7 @@
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
- export SED
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch
deleted file mode 100644
index 322de8fd4a..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691267]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd gtk+-2.24.14/configure.in gtk+-2.24.14/configure.in
---- gtk+-2.24.14/configure.in	2012-12-06 05:46:07.000000000 +0200
-+++ gtk+-2.24.14/configure.in	2013-01-07 04:18:43.546039799 +0200
-@@ -51,7 +51,7 @@
- cflags_set=${CFLAGS+set}
-
- AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- # Support silent build rules, requires at least automake-1.11. Enable
- # by either passing --enable-silent-rules to configure or passing V=0
-@@ -300,7 +300,6 @@
-
- # Checks for programs.
- AC_ISC_POSIX
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
index 71e334d897..71e334d897 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index 354f0ab376..354f0ab376 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/cellrenderer-cairo.patch
index ba893292d6..ba893292d6 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/configure-nm.patch
index 5f40508077..d67b797852 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/configure-nm.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/configure-nm.patch
@@ -3,8 +3,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=671515
 
 Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 # Pick up ${NM} from the environment
---- a/configure.in
-+++ b/configure.in
+
+Updated to apply to gtk+-2.24.15
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
+--- gtk+-2.24.15/configure.ac	2013-01-12 20:52:54.000000000 +0200
++++ gtk+-2.24.15/configure.ac	2013-02-12 21:25:06.073937041 +0200
 @@ -190,7 +190,7 @@
  AC_SYS_LARGEFILE
  
@@ -13,4 +18,4 @@ Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 +AC_CHECK_TOOLS(NM, [$NM nm], nm)
  
  dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
+ AM_MAINTAINER_MODE([enable])
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/configurefix.patch
index 2803691246..2803691246 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/doc-fixes.patch
index 74e479fd1b..74e479fd1b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/doc-fixes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/entry-cairo.patch
index 3083b77830..3083b77830 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.14/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.15/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.15/hardcoded_libtool.patch
new file mode 100644
index 0000000000..13ff318768
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.15/hardcoded_libtool.patch
@@ -0,0 +1,1814 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Updated to apply to gtk+-2.24.15
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
+--- gtk+-2.24.15/configure.ac	2013-01-12 20:52:54.000000000 +0200
++++ gtk+-2.24.15/configure.ac	2013-02-12 21:33:30.689925967 +0200
+@@ -415,7 +415,7 @@
+ case $enable_explicit_deps in
+   auto)
+     export SED
+-    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
++    deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
+     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+       enable_explicit_deps=yes
+     else
+@@ -774,7 +774,7 @@
+     dnl Now we check to see if our libtool supports shared lib deps
+     dnl (in a rather ugly way even)
+     if $dynworks; then
+-        module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
++        module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
+         module_deplibs_check=`$module_libtool_config | \
+             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+@@ -1574,7 +1574,7 @@
+ # We are using gmodule-no-export now, but I'm leaving the stripping
+ # code in place for now, since pango and atk still require gmodule.
+ export SED
+-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ if test -n "$export_dynamic"; then
+   GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
+   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
+diff -Nurd gtk+-2.24.15/configure.ac.orig gtk+-2.24.15/configure.ac.orig
+--- gtk+-2.24.15/configure.ac.orig	1970-01-01 02:00:00.000000000 +0200
++++ gtk+-2.24.15/configure.ac.orig	2013-02-12 21:33:21.821926163 +0200
+@@ -0,0 +1,1775 @@
++# Process this file with autoconf to produce a configure script.
++# Process this file with autoconf to produce a configure script.
++# require autoconf 2.54
++AC_PREREQ(2.62)
++
++# Making releases:
++#   GTK_MICRO_VERSION += 1;
++#   GTK_INTERFACE_AGE += 1;
++#   GTK_BINARY_AGE += 1;
++# if any functions have been added, set GTK_INTERFACE_AGE to 0.
++# if backwards compatibility has been broken,
++# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
++
++m4_define([gtk_major_version], [2])
++m4_define([gtk_minor_version], [24])
++m4_define([gtk_micro_version], [15])
++m4_define([gtk_interface_age], [15])
++m4_define([gtk_binary_age],
++          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
++m4_define([gtk_version],
++          [gtk_major_version.gtk_minor_version.gtk_micro_version])
++# This is the X.Y used in -lgtk-FOO-X.Y
++m4_define([gtk_api_version], [2.0])
++
++# Define a string for the earliest version that this release has
++# backwards binary compatibility with for all interfaces a module
++# might. Unless we add module-only API with lower stability
++# guarantees, this should be unchanged until we break binary compat
++# for GTK+.
++#
++#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
++m4_define([gtk_binary_version], [2.10.0])
++
++# required versions of other packages
++m4_define([glib_required_version], [2.28.0])
++m4_define([pango_required_version], [1.20])
++m4_define([atk_required_version], [1.29.2])
++m4_define([cairo_required_version], [1.6])
++m4_define([gdk_pixbuf_required_version], [2.21.0])
++
++
++AC_INIT([gtk+], [gtk_version],
++        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
++	[gtk+])
++
++AC_CONFIG_SRCDIR([gdk/gdktypes.h])
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_MACRO_DIR([m4])
++
++# Save this value here, since automake will set cflags later
++cflags_set=${CFLAGS+set}
++
++AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
++
++# Support silent build rules, requires at least automake-1.11. Enable
++# by either passing --enable-silent-rules to configure or passing V=0
++# to make
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
++
++#
++# For each of the libraries we build, we define the following
++
++# substituted variables:
++#
++# foo_PACKAGES:     pkg-config packages this library requires
++# foo_EXTRA_LIBS:   Libraries this module requires not pulled in by pkg-config
++# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config
++# foo_DEP_LIBS:     All libraries this module requires
++# foo_DEP_CFLAGS:   All cflags this module requires
++
++
++GTK_MAJOR_VERSION=gtk_major_version
++GTK_MINOR_VERSION=gtk_minor_version
++GTK_MICRO_VERSION=gtk_micro_version
++GTK_INTERFACE_AGE=gtk_interface_age
++GTK_BINARY_AGE=gtk_binary_age
++GTK_VERSION=gtk_version
++GTK_API_VERSION=gtk_api_version
++GTK_BINARY_VERSION=gtk_binary_version
++AC_SUBST(GTK_MAJOR_VERSION)
++AC_SUBST(GTK_MINOR_VERSION)
++AC_SUBST(GTK_MICRO_VERSION)
++AC_SUBST(GTK_INTERFACE_AGE)
++AC_SUBST(GTK_BINARY_AGE)
++AC_SUBST(GTK_API_VERSION)
++AC_SUBST(GTK_VERSION)
++AC_SUBST(GTK_BINARY_VERSION)
++
++# libtool versioning
++#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
++#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
++#LT_REVISION=$GTK_INTERFACE_AGE
++#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
++#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
++
++m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
++m4_define([lt_revision], [gtk_interface_age])
++m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)])
++LT_VERSION_INFO="lt_current:lt_revision:lt_age"
++LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
++AC_SUBST(LT_VERSION_INFO)
++AC_SUBST(LT_CURRENT_MINUS_AGE)
++
++m4_define([gail_lt_current],[18])
++m4_define([gail_lt_revision],[1])
++m4_define([gail_lt_age],[0])
++m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
++m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
++AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
++AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
++
++GETTEXT_PACKAGE=gtk20
++AC_SUBST(GETTEXT_PACKAGE)
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
++                   [The prefix for our gettext translation domains.])
++
++AC_CANONICAL_HOST
++
++MATH_LIB=-lm
++AC_MSG_CHECKING([for native Win32])
++LIB_EXE_MACHINE_FLAG=X86
++EXE_MANIFEST_ARCHITECTURE=X86
++case "$host" in
++  *-*-mingw*)
++    os_win32=yes
++    gio_can_sniff=no
++    MATH_LIB=
++    case "$host" in
++    x86_64-*-*)
++      LIB_EXE_MACHINE_FLAG=X64
++      EXE_MANIFEST_ARCHITECTURE=AMD64
++      ;;
++    esac
++    ;;
++  *)
++    os_win32=no
++    ;;
++esac
++AC_MSG_RESULT([$os_win32])
++
++AC_SUBST(LIB_EXE_MACHINE_FLAG)
++AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
++
++case $host in
++  *-*-linux*)
++    os_linux=yes
++    ;;
++esac
++
++dnl Initialize libtool
++AC_PROG_CC
++AM_DISABLE_STATIC
++
++dnl
++dnl Check for a working C++ compiler, but do not bail out, if none is found.
++dnl We use this for an automated test for C++ header correctness.
++dnl
++AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
++AC_LANG_SAVE
++AC_LANG_CPLUSPLUS
++
++AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
++AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
++
++gtk_save_cxxflags="$CXXFLAGS"
++CXXFLAGS="$CXXFLAGS -x objective-c++"
++AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
++AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
++CXXFLAGS="$gtk_save_cxxflags"
++AC_LANG_RESTORE
++
++if test "$os_win32" = "yes"; then
++  if test x$enable_static = xyes -o x$enable_static = x; then
++    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
++    enable_static=no
++  fi
++  if test x$enable_shared = xno; then
++    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
++  fi
++  enable_shared=yes
++fi
++
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++dnl when using libtool 2.x create libtool early, because it's used in configure
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
++
++
++# Make sure we use 64-bit versions of various file stuff.
++AC_SYS_LARGEFILE
++
++AM_PROG_AS
++AC_PATH_PROG(NM, nm, nm)
++
++dnl Initialize maintainer mode
++AM_MAINTAINER_MODE([enable])
++
++AC_MSG_CHECKING([for some Win32 platform])
++case "$host" in
++  *-*-mingw*|*-*-cygwin*)
++    platform_win32=yes
++    ;;
++  *)
++    platform_win32=no
++    ;;
++esac
++AC_MSG_RESULT([$platform_win32])
++AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
++
++AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
++AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
++AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
++
++if test "$os_win32" = "yes"; then
++  AC_CHECK_TOOL(WINDRES, windres, no)
++  if test "$WINDRES" = no; then
++    AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
++  fi
++  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
++fi
++AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
++
++m4_define([debug_default],
++          m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum]))
++
++dnl declare --enable-* args and collect ac_help strings
++AC_ARG_ENABLE(debug,
++              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
++                             [turn on debugging @<:@default=debug_default@:>@]),,
++              enable_debug=debug_default)
++AC_ARG_ENABLE(shm,
++              [AC_HELP_STRING([--enable-shm],
++                              [support shared memory if available [default=yes]])],,
++              [enable_shm="yes"])
++AC_ARG_ENABLE(xkb,
++              [AC_HELP_STRING([--enable-xkb],
++                              [support XKB [default=maybe]])],,
++              [enable_xkb="maybe"])
++AC_ARG_ENABLE(xinerama,
++              [AC_HELP_STRING([--enable-xinerama],
++	                      [support xinerama extension if available [default=yes]])],,
++              [enable_xinerama="yes"])
++AC_ARG_ENABLE(rebuilds,
++              [AC_HELP_STRING([--disable-rebuilds],
++                              [disable all source autogeneration rules])],,
++              [enable_rebuilds=yes])
++AC_ARG_ENABLE(visibility,
++              [AC_HELP_STRING([--disable-visibility],
++                              [don't use ELF visibility attributes])],,
++              [enable_visibility=yes])
++
++AC_ARG_WITH(xinput,
++            [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
++
++if test "$platform_win32" = yes; then
++  gdktarget=win32
++else
++  gdktarget=x11
++fi
++
++AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
++	gdktarget=$with_gdktarget)
++
++AC_SUBST(gdktarget)
++case $gdktarget in
++  x11|win32|quartz|directfb) ;;
++  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
++esac
++
++gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
++gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
++
++AC_SUBST(gdktargetlib)
++AC_SUBST(gtktargetlib)
++
++if test "x$enable_debug" = "xyes"; then
++  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
++  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
++else
++  if test "x$enable_debug" = "xno"; then
++    GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
++  else
++    GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
++  fi
++fi
++
++
++if test "x$enable_visibility" = "xno"; then
++  GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
++fi
++
++
++AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
++                   [Define if debugging is enabled])
++
++
++# Build time sanity check...
++AM_SANITY_CHECK
++
++# Checks for programs.
++AC_ISC_POSIX
++AM_PROG_CC_C_O
++AC_PROG_INSTALL
++AC_PROG_MAKE_SET
++
++changequote(,)dnl
++if test "x$GCC" = "xyes"; then
++  case " $CFLAGS " in
++  *[\ \	]-Wall[\ \	]*) ;;
++  *) CFLAGS="$CFLAGS -Wall" ;;
++  esac
++
++  if test "x$enable_ansi" = "xyes"; then
++    case " $CFLAGS " in
++    *[\ \	]-ansi[\ \	]*) ;;
++    *) CFLAGS="$CFLAGS -ansi" ;;
++    esac
++
++    case " $CFLAGS " in
++    *[\ \	]-pedantic[\ \	]*) ;;
++    *) CFLAGS="$CFLAGS -pedantic" ;;
++    esac
++  fi
++fi
++changequote([,])dnl
++
++CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
++
++# Ensure MSVC-compatible struct packing convention is used when
++# compiling for Win32 with gcc.
++# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
++# gcc2 uses "-fnative-struct".
++if test x"$os_win32" = xyes; then
++  if test x"$GCC" = xyes; then
++    msnative_struct=''
++    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
++    if test -z "$ac_cv_prog_CC"; then
++      our_gcc="$CC"
++    else
++      our_gcc="$ac_cv_prog_CC"
++    fi
++    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
++      2.)
++	if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
++	  msnative_struct='-fnative-struct'
++	fi
++	;;
++      *)
++	if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
++	  msnative_struct='-mms-bitfields'
++	fi
++	;;
++    esac
++    if test x"$msnative_struct" = x ; then
++      AC_MSG_RESULT([no way])
++      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
++    else
++      CFLAGS="$CFLAGS $msnative_struct"
++      AC_MSG_RESULT([${msnative_struct}])
++    fi
++  fi
++fi
++
++# Honor aclocal flags
++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
++
++## Initial sanity check, done here so that users get told they
++## have the wrong dependencies as early in the process as possible.
++## Later on we actually use the cflags/libs from separate pkg-config
++## calls. Oh, also the later pkg-config calls don't include
++## the version requirements since those make the module lists
++## annoying to construct
++PKG_CHECK_MODULES(BASE_DEPENDENCIES,
++  [glib-2.0 >= glib_required_version dnl
++   atk >= atk_required_version dnl
++   pango >= pango_required_version dnl
++   cairo >= cairo_required_version dnl
++   gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
++
++## In addition to checking that cairo is present, we also need to
++## check that the correct cairo backend is there. E.g. if the GDK
++## target is win32 we need the cairo-win32 backend and so on.
++cairo_backend=$gdktarget
++
++# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
++# backend names are identical.
++if test "x$cairo_backend" = "xx11"; then
++   cairo_backend=xlib
++fi
++PKG_CHECK_MODULES(CAIRO_BACKEND,
++  [cairo-$cairo_backend >= cairo_required_version])
++
++PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
++
++if test "$os_win32" != yes; then
++    # libtool option to control which symbols are exported
++    # right now, symbols starting with _ are not exported
++    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
++else
++    # We currently use .def files on Windows (for gdk and gtk)
++    LIBTOOL_EXPORT_OPTIONS=
++fi
++AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
++
++dnl ******************************************************
++dnl * See whether to include shared library dependencies *
++dnl ******************************************************
++
++AC_ARG_ENABLE(explicit-deps,
++              [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
++                              [use explicit dependencies in .pc files [default=auto]])],,
++              [enable_explicit_deps=auto])
++
++AC_MSG_CHECKING([Whether to write dependencies into .pc files])
++case $enable_explicit_deps in
++  auto)
++    export SED
++    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
++    if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
++      enable_explicit_deps=yes
++    else
++      enable_explicit_deps=no
++    fi
++  ;;
++  yes|no)
++  ;;
++  *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
++  ;;
++esac
++AC_MSG_RESULT($enable_explicit_deps)
++
++AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
++
++# define a MAINT-like variable REBUILD which is set if Perl
++# and awk are found, so autogenerated sources can be rebuilt
++
++AC_PATH_PROGS(PERL, perl5 perl)
++
++# We would like indent, but don't require it.
++AC_CHECK_PROG(INDENT, indent, indent)
++
++REBUILD=\#
++if test "x$enable_rebuilds" = "xyes" && \
++     test -n "$PERL" && \
++     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
++  REBUILD=
++fi
++AC_SUBST(REBUILD)
++
++AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
++AC_CHECK_FUNCS(localtime_r)
++
++# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
++AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
++	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
++fi
++
++# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
++AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *)  nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
++	    [Define if _NL_MEASUREMENT_MEASUREMENT is available])
++fi
++
++# _NL_PAPER_HEIGHT is an enum and not a define
++AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *)  nl_langinfo(_NL_PAPER_HEIGHT));
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++  AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
++	    [Define if _NL_PAPER_HEIGHT is available])
++fi
++
++# _NL_PAPER_WIDTH is an enum and not a define
++AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *)  nl_langinfo(_NL_PAPER_WIDTH));
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++  AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
++	    [Define if _NL_PAPER_WIDTH is available])
++fi
++
++# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
++AC_MSG_CHECKING(for sigsetjmp)
++AC_TRY_LINK([#include <setjmp.h>], [
++sigjmp_buf env;
++sigsetjmp(env, 0);
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++  AC_DEFINE(HAVE_SIGSETJMP, 1,
++            [Define to 1 if sigsetjmp is available])
++fi
++
++# i18n stuff
++ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
++AM_GLIB_GNU_GETTEXT
++LIBS="$LIBS $INTLLIBS"
++AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
++        sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
++      esac])
++
++dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
++dnl po-properties/POTFILES during configure; see GNOME #573515.
++dnl
++dnl Generate list of files to be processed by xgettext which will
++dnl be included in po-properties/Makefile.
++test -d po-properties || mkdir po-properties
++if test "x$srcdir" != "x."; then
++  if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++    popropsrcprefix="$srcdir/"
++  else
++    popropsrcprefix="../$srcdir/"
++  fi
++else
++  popropsrcprefix="../"
++fi
++rm -f po-properties/POTFILES
++sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
++dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
++
++AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
++
++dnl The DU4 header files don't provide library prototypes unless
++dnl -std1 is given to the native cc.
++AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
++
++gtk_save_LIBS=$LIBS
++LIBS="$LIBS -lm"
++AC_TRY_RUN([#include <math.h>
++             int main (void) { return (log(1) != log(1.)); }],
++     AC_MSG_RESULT(none needed),
++     gtk_save_CFLAGS="$CFLAGS"
++     CFLAGS="$CFLAGS -std1"
++     AC_TRY_RUN([#include <math.h>
++	         int main (void) { return (log(1) != log(1.)); }],
++         AC_MSG_RESULT(-std1),
++         AC_MSG_RESULT()
++         CFLAGS="$gtk_save_CFLAGS"
++         AC_MSG_WARN(
++                [No ANSI prototypes found in library. (-std1 didn't work.)]),
++	 true
++     ),
++     AC_MSG_RESULT(none needed)
++)
++LIBS=$gtk_save_LIBS
++
++AC_MSG_CHECKING(for the BeOS)
++case $host in
++  *-*-beos*)
++    AC_MSG_RESULT(yes)
++    MATH_LIB=
++  ;;
++  *)
++    AC_MSG_RESULT(no)
++  ;;
++esac
++
++AC_SUBST(MATH_LIB)
++#
++# see bug 162979
++#
++AC_MSG_CHECKING(for HP-UX)
++case $host_os in
++  hpux9* | hpux10* | hpux11*)
++    AC_MSG_RESULT(yes)
++    CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
++  ;;
++  *)
++    AC_MSG_RESULT(no)
++  ;;
++esac
++
++dnl NeXTStep cc seems to need this
++AC_MSG_CHECKING([for extra flags for POSIX compliance])
++AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
++  AC_MSG_RESULT(none needed),
++  gtk_save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -posix"
++  AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
++    AC_MSG_RESULT(-posix),
++    AC_MSG_RESULT()
++    CFLAGS="$gtk_save_CFLAGS"
++    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
++
++#
++# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
++#
++
++GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
++
++AM_PATH_GLIB_2_0(glib_required_version, :,
++  AC_MSG_ERROR([
++*** GLIB glib_required_version or better is required. The latest version of
++*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
++  gobject gmodule-no-export gthread)
++
++# See if it's safe to turn G_DISABLE_DEPRECATED on.
++GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
++GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
++if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
++  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
++fi
++
++CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
++
++
++dnl
++dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
++dnl
++gtk_save_LIBS=$LIBS
++LIBS="$LIBS $GLIB_LIBS"
++AC_CHECK_FUNCS(bind_textdomain_codeset)
++LIBS=$gtk_save_LIBS
++
++AC_CHECK_HEADERS(pwd.h,
++                 AC_DEFINE(HAVE_PWD_H, 1,
++                           [Define to 1 if pwd.h is available]))
++AC_CHECK_HEADERS(sys/time.h,
++                 AC_DEFINE(HAVE_SYS_TIME_H, 1,
++                           [Define to 1 if time.h is available]))
++AC_CHECK_HEADERS(unistd.h,
++                 AC_DEFINE(HAVE_UNISTD_H, 1,
++                           [Define to 1 if unistd.h is available]))
++AC_CHECK_HEADERS(ftw.h,
++                 AC_DEFINE(HAVE_FTW_H, 1,
++                           [Define to 1 if ftw.h is available]))
++
++AC_MSG_CHECKING([for GNU ftw extensions])
++AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
++#define _GNU_SOURCE
++#include <ftw.h>], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no)
++if test $gt