This allows libjava to cross build in an environment where <triplet>-pkg-config
is available for the target architecture.  This change is already available in
pkg-config 0.26, so an alternative would be to import this file from a recent
pkg-config release.

Ok for the trunk, and 4.8?

  Matthias
2013-06-19  Matthias Klose  <d...@ubuntu.com>

        * pkg.m4 (PKG_CHECK_MODULES): Use AC_PATH_TOOL to check for pkg-config.
        * classpath/m4/pkg.m4 (PKG_CHECK_MODULES): Likewise.
        * configure: Regenerate.

Index: pkg.m4
===================================================================
--- pkg.m4      (revision 200211)
+++ pkg.m4      (working copy)
@@ -6,7 +6,7 @@
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
Index: classpath/m4/pkg.m4
===================================================================
--- classpath/m4/pkg.m4 (revision 200211)
+++ classpath/m4/pkg.m4 (working copy)
@@ -6,7 +6,7 @@
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
   fi
 
   if test "$PKG_CONFIG" = "no" ; then

Reply via email to