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

[Vladimir 'φ-coder/phcoder' Serbinenko]

On 11.06.2013 19:31, David Michael wrote:
> Hi,
> 
> A patch with a ChangeLog entry follows.  I didn't see very specific
> submission guidelines, so let me know if this message needs to be sent
> in some more rigid format.
> 
> Thanks.

Patch is good. Comitting it.
@Andrey: Thanks for handling this.
> 
> David
> 
> 
> === modified file 'ChangeLog'
> --- ChangeLog 2013-06-07 16:36:42 +0000
> +++ ChangeLog 2013-06-11 16:28:03 +0000
> @@ -1,3 +1,8 @@
> +2013-06-11  David Michael  <address@hidden>
> +
> +     * configure.ac (FREETYPE): Change AC_CHECK_PROGS to AC_CHECK_TOOLS.
> +     (freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE.
> +
>  2013-06-07  Andrey Borzenkov <address@hidden>
> 
>       * grub-core/script/execute.c (grub_script_execute_sourcecode): Split
> 
> === 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], [],
> 
> _______________________________________________
> Grub-devel mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/grub-devel
>

signature.asc
Description: OpenPGP digital signature