[gtk+/gtk-2-24] Fix AM_PATH_GTK_2_0 for cross compilation

[Matthias Clasen <matthiasc src gnome org>]

commit 29da0d99aae55b3fec1128ba7f7dc73539069155
Author: Kylie McClain <somasissounds gmail com>
Date:   Tue May 19 20:53:00 2015 +0000

    Fix AM_PATH_GTK_2_0 for cross compilation
    
    With the current code used in the m4 macro, gtk-2.0.m4 can't find
    a prefixed pkg-config. This presents issue when cross compiling, as
    pkg-config needs to be prefixed to work with the target being compiled
    for.
    
    Change the macro to use PKG_PROG_PKG_CONFIG rather than custom
    detection code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749507

 m4macros/gtk-2.0.m4 |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4
index 88596a9..3c6b6dd 100644
--- a/m4macros/gtk-2.0.m4
+++ b/m4macros/gtk-2.0.m4
@@ -24,19 +24,8 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
 
   no_gtk=""
 
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  PKG_PROG_PKG_CONFIG([0.7])
 
   min_gtk_version=ifelse([$1], ,2.0.0,$1)
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)