grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [BUG][PATCH] configure.ac: Respect the configured freetype-config


From: David Michael
Subject: Re: [BUG][PATCH] configure.ac: Respect the configured freetype-config
Date: Tue, 11 Jun 2013 10:31:31 -0400

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
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?

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], [],



reply via email to

[Prev in Thread] Current Thread [Next in Thread]