From 497b4e64ceeff10f40104d26139fa7f1ee347095 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 10 Jul 2013 20:48:48 +0000
Subject: [PATCH] Fix checking for GTK+ 3.0 in configure.

Update gtk-3.0.m4 to work correctly with gthread module and regenerate
configure using the new version of this file.

Closes #15319.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/aclocal/gtk-3.0.m4 | 11 ++++++-----
 configure                |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build/aclocal/gtk-3.0.m4 b/build/aclocal/gtk-3.0.m4
index 5238b43498..f3b1402d77 100644
--- a/build/aclocal/gtk-3.0.m4
+++ b/build/aclocal/gtk-3.0.m4
@@ -12,12 +12,14 @@ dnl
 AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
 		    , enable_gtktest=yes)
 
-  pkg_config_args=gtk+-3.0
+  pkg_gtk_version=gtk+-3.0
+  pkg_config_args=$pkg_gtk_version
   for module in . $4
   do
       case "$module" in
          gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
+             pkg_gthread_version=gthread-2.0
+             pkg_config_args="$pkg_config_args $pkg_gthread_version"
          ;;
       esac
   done
@@ -47,8 +49,7 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
 	  enable_gtktest=no
     fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
 	  :
     else
 	  no_gtk=yes
@@ -205,7 +206,7 @@ AC_DEFUN([GTK_CHECK_BACKEND],
 
   AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
 
-  if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args ; then
+  if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
     target_found=yes
   else
     target_found=no
diff --git a/configure b/configure
index 8163b56184..ccdb05d259 100755
--- a/configure
+++ b/configure
@@ -23646,12 +23646,14 @@ else
 fi
 
 
-  pkg_config_args=gtk+-3.0
+  pkg_gtk_version=gtk+-3.0
+  pkg_config_args=$pkg_gtk_version
   for module in . $GTK_MODULES
   do
       case "$module" in
          gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
+             pkg_gthread_version=gthread-2.0
+             pkg_config_args="$pkg_config_args $pkg_gthread_version"
          ;;
       esac
   done
@@ -23722,8 +23724,7 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
 	  enable_gtktest=no
     fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
 	  :
     else
 	  no_gtk=yes
-- 
2.45.2