From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <java-patches-return-20714-listarch-java-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 18770 invoked by alias); 19 Jun 2013 19:20:01 -0000
Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <java-patches.gcc.gnu.org>
List-Subscribe: <mailto:java-patches-subscribe@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/java-patches/>
List-Post: <mailto:java-patches@gcc.gnu.org>
List-Help: <mailto:java-patches-help@gcc.gnu.org>, <http://gcc.gnu.org/ml/#faqs>
Sender: java-patches-owner@gcc.gnu.org
Received: (qmail 18758 invoked by uid 89); 19 Jun 2013 19:20:00 -0000
X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_LOW,TW_IB autolearn=ham version=3.3.1
Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112)    by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 19 Jun 2013 19:19:59 +0000
Received: from dslb-088-073-088-178.pools.arcor-ip.net ([88.73.88.178] helo=[192.168.42.222])	by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)	(Exim 4.71)	(envelope-from <doko@ubuntu.com>)	id 1UpNvB-00054T-DE; Wed, 19 Jun 2013 19:19:57 +0000
Message-ID: <51C2045A.2070303@ubuntu.com>
Date: Wed, 19 Jun 2013 19:20:00 -0000
From: Matthias Klose <doko@ubuntu.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6
MIME-Version: 1.0
To: GCJ-patches <java-patches@gcc.gnu.org>
CC: classpath-patches@gnu.org
Subject: [patch] search for a <triplet>-pkg-config
Content-Type: multipart/mixed; boundary="------------050504060007010604080300"
X-Virus-Found: No
X-SW-Source: 2013-q2/txt/msg00058.txt.bz2

This is a multi-part message in MIME format.
--------------050504060007010604080300
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Content-length: 297

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

--------------050504060007010604080300
Content-Type: text/plain; charset=UTF-8;
 name="libjava.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="libjava.diff"
Content-length: 928

2013-06-19  Matthias Klose  <doko@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

--------------050504060007010604080300--