diff --git a/ChangeLog b/ChangeLog
index 050b74a3f..2d204338e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-16  Yves Blusseau  <blusseau@zetam.org>
+
+	* configure.ac: Avoid some annoying error messages if freetype-config
+	program is not found.
+
 2010-09-16  Colin Watson  <cjwatson@ubuntu.com>
 
 	Support RAID on virtio devices, and others.
diff --git a/configure.ac b/configure.ac
index 10723987b..57df640b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -796,12 +796,12 @@ if test x"$grub_mkfont_excuse" = x ; then
   if test "x$FREETYPE" = x ; then
     grub_mkfont_excuse=["need freetype2 library"]
   fi
-  freetype_cflags=`freetype-config --cflags`
-  freetype_libs=`freetype-config --libs`
 fi
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
+  freetype_cflags=`freetype-config --cflags`
+  freetype_libs=`freetype-config --libs`
   SAVED_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $freetype_cflags"
   AC_CHECK_HEADERS([ft2build.h], [],