From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 30 May 2013 19:51:34 +0000 (+0200)
Subject: 	* configure.ac: Add Ubuntu path to unifont and report unifont path used.
X-Git-Tag: grub-2.02-beta1~990
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b80e43c8c796cb35fbd12c24f9bb8adbe18e702;p=thirdparty%2Fgrub.git

	* configure.ac: Add Ubuntu path to unifont and report unifont path used.
---

diff --git a/ChangeLog b/ChangeLog
index 682936b3d..b468a0ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Add Ubuntu path to unifont and report unifont path used.
+
 2013-05-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.am, conf/Makefile.common: Fix compilation problem with some
diff --git a/configure.ac b/configure.ac
index bb4071a90..c151550e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,7 @@ fi
 FONT_SOURCE=
 
 for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
-  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do
+  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont; do
     if test -f "$dir/unifont.$ext"; then
       FONT_SOURCE="$dir/unifont.$ext"
       break 2
@@ -1288,5 +1288,10 @@ echo With libzfs support: Yes
 else
 echo With libzfs support: No "($libzfs_excuse)"
 fi
+if test "x$FONT_SOURCE" = x ; then
+echo "Without unifont"
+else
+echo "With unifont from $FONT_SOURCE"
+fi
 echo "*******************************************************"
 ]