From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W4YI2-0005TA-BN for mharc-grub-devel@gnu.org; Sat, 18 Jan 2014 10:58:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4YHv-0005Su-Ba for grub-devel@gnu.org; Sat, 18 Jan 2014 10:58:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4YHp-0004si-Ol for grub-devel@gnu.org; Sat, 18 Jan 2014 10:58:23 -0500 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:40347) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4YHp-0004sZ-HG for grub-devel@gnu.org; Sat, 18 Jan 2014 10:58:17 -0500 Received: by mail-la0-f43.google.com with SMTP id er20so4446162lab.16 for ; Sat, 18 Jan 2014 07:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=Ff9/9IA8urTflSZie5E65Gtj93EpVpboCQTIuCmk/7U=; b=qOGmewROB5uJQYi1ciYg4U8F62PHSdIgjhrkzMtlWvV1tH/tsKmQkLSuTBBpgivdnC 2OKw5gg92L2qdrwU5EIbM67L7poNhBMFy5yUCK9m5aXO3PbchI31zJuEclp2/oAhuPpD SdT+C6OBfnYTPnbmO9lagwNy0eRtSj2XKlY7/moxKMBupBrK8pUkb4sF+ecyle/t5guj GlZy0la9s9cyPi4Iovjf7ykhXmLb7eRYGPu9+5wTW8G4e9Bl1K8ceGC3VnzOdzadZ8hQ bpQKEOp2NuGrJAAhGwN/oF4ZFMHGCVgbvmVloGV5eIEX3s/esPQc0JDZxgUipZuSSUdv UbWQ== X-Received: by 10.112.163.70 with SMTP id yg6mr4655064lbb.9.1390060696360; Sat, 18 Jan 2014 07:58:16 -0800 (PST) Received: from localhost.localdomain (ppp91-76-163-241.pppoe.mtu-net.ru. [91.76.163.241]) by mx.google.com with ESMTPSA id j1sm11406011laj.3.2014.01.18.07.58.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jan 2014 07:58:15 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] Improve DejaVuSans detection Date: Sat, 18 Jan 2014 19:58:11 +0400 Message-Id: <1390060691-9862-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1389528954-24812-1-git-send-email-arvidjaar@gmail.com> References: <1389528954-24812-1-git-send-email-arvidjaar@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b 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: Sat, 18 Jan 2014 15:58:29 -0000 Look also in /usr/share/fonts/truetype, it is installed in this path on openSUSE. Prefer DejaVuSansMono if found, on openSUSE DejaVuSans is proportional font. Add detected path name to summary output. --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e4cf3c..98f6012 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,11 +1378,13 @@ fi if test x"$starfield_excuse" = x; then 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/truetype/ttf-dejavu /usr/share/fonts/dejavu; do - if test -f "$dir/DejaVuSans.$ext"; then - DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" - break 2 - fi + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do + for font in DejaVuSansMono DejaVuSans; do + if test -f "$dir/$font.$ext"; then + DJVU_FONT_SOURCE="$dir/$font.$ext" + break 2 + fi + done done done @@ -1805,6 +1807,7 @@ echo grub-mount: No "($grub_mount_excuse)" fi if [ x"$starfield_excuse" = x ]; then echo starfield theme: Yes +echo With DejaVuSans font from $DJVU_FONT_SOURCE else echo starfield theme: No "($starfield_excuse)" fi -- tg: (dcecae1..) u/dejavu-path (depends on: master)