From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UmPrp-0003as-26 for mharc-grub-devel@gnu.org; Tue, 11 Jun 2013 10:48:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmPrm-0003Ym-IH for grub-devel@gnu.org; Tue, 11 Jun 2013 10:48:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmPrk-000692-JK for grub-devel@gnu.org; Tue, 11 Jun 2013 10:48:10 -0400 Received: from mail-la0-x231.google.com ([2a00:1450:4010:c03::231]:57367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmPrk-00068j-Dc for grub-devel@gnu.org; Tue, 11 Jun 2013 10:48:08 -0400 Received: by mail-la0-f49.google.com with SMTP id ea20so3392953lab.36 for ; Tue, 11 Jun 2013 07:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; bh=MmPv0zKU2Lp8Fz9oMKiUJ9aZJ9F2IeSzWPIiKyeMrqQ=; b=AX2nzs55cpfR/A5AKNbrwv1OLbwIsISO4OPfJP3+U4NvC66LvSjdBmL93Ur2hnIrmu GRuK88P4+TaekF23w5voqmHZtYzcbYwMeyjvTuNfHbQS4uxCglHIIHcfZIKSExw9y+mX 5XPguUt4s6nLdV4FNqd+5HflXkbpg6iAPul4zMjutdKdq/Vdmm+Hz1eql6LwNss0zLMw P7c+BsApVQxgoOrQajzHwoHoccXyS9njHMc55nMPMkQhY4dIPdDtpfCAdBnriUlT8evj jP4acc7icoOxdWRf5IAXuZS3qBjuFfngCZkwz/m//AhXksOBkN3p+MPtDNy/YcDNnyxC n0Og== X-Received: by 10.112.89.73 with SMTP id bm9mr9127085lbb.39.1370962086929; Tue, 11 Jun 2013 07:48:06 -0700 (PDT) Received: from opensuse.site (ppp79-139-160-84.pppoe.spdop.ru. [79.139.160.84]) by mx.google.com with ESMTPSA id n1sm6445350lae.0.2013.06.11.07.48.06 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 11 Jun 2013 07:48:06 -0700 (PDT) Date: Tue, 11 Jun 2013 18:48:02 +0400 From: Andrey Borzenkov To: David Michael Subject: Re: [BUG][PATCH] configure.ac: Respect the configured freetype-config Message-ID: <20130611184802.7336d060@opensuse.site> In-Reply-To: References: <20130607222002.6d37ec61@opensuse.site> <20130608080051.26e42526@opensuse.site> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.18; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::231 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2013 14:48:11 -0000 В Tue, 11 Jun 2013 10:31:31 -0400 David Michael пишет: > Hi, > > Upon further consideration, I modified my cross-freetype package to > also install a host-prefixed freetype-config in the system path. I > probably should have been doing this all along to mimic the equivalent > pkg-config commands... > > I would therefore suggest changing AC_CHECK_PROGS to AC_CHECK_TOOLS to I was about to suggest the same :) > search for a host-specific config script when cross-compiling. (The > previous patch is still required since now the program name can be > prefixed.) This should preserve existing behavior on native builds, > and allow cross-compiling grub-mkfont without modifying PATH or > manually setting FREETYPE. It will also print a warning if using the > build system's freetype while cross-compiling. > > The new change follows. Thoughts? > Does it also work for non-cross build? AFAIK it should, but just to confirm? > Thanks. > > David > > > === modified file 'configure.ac' > --- configure.ac 2013-06-07 14:02:16 +0000 > +++ configure.ac 2013-06-11 13:54:44 +0000 > @@ -944,7 +944,7 @@ > > if test x"$grub_mkfont_excuse" = x ; then > # Check for freetype libraries. > - AC_CHECK_PROGS([FREETYPE], [freetype-config]) > + AC_CHECK_TOOLS([FREETYPE], [freetype-config]) > if test "x$FREETYPE" = x ; then > grub_mkfont_excuse=["need freetype2 library"] > fi > @@ -952,8 +952,8 @@ > > if test x"$grub_mkfont_excuse" = x ; then > # Check for freetype libraries. > - freetype_cflags=`freetype-config --cflags` > - freetype_libs=`freetype-config --libs` > + freetype_cflags=`$FREETYPE --cflags` > + freetype_libs=`$FREETYPE --libs` > SAVED_CPPFLAGS="$CPPFLAGS" > CPPFLAGS="$CPPFLAGS $freetype_cflags" > AC_CHECK_HEADERS([ft2build.h], [],