Grub Development Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Grégoire Sutre" <gregoire.sutre@gmail.com>
To: The development of GNU GRUB <grub-devel@gnu.org>
Subject: [Patch] Unifont search in configure.ac
Date: Sat, 22 May 2010 15:17:43 +0200	[thread overview]
Message-ID: <4BF7D977.1020508@gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

Hi,

With the attached patch, unifont is searched by extension first (pcf
being the preferred one), and then by directory.

The first directory being searched is `.', which allows non-root users
to install ascii.pf2 and unifont.pf2 by first downloading unifont in
the build directory.

Grégoire

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: unifont-patch.diff --]
[-- Type: text/x-patch; name="unifont-patch.diff", Size: 1046 bytes --]

=== modified file 'ChangeLog'
--- ChangeLog	2010-05-21 18:22:29 +0000
+++ ChangeLog	2010-05-22 13:03:00 +0000
@@ -1,3 +1,7 @@
+2010-05-22  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Add `.' to the directories searched for unifont.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry

=== modified file 'configure.ac'
--- configure.ac	2010-05-18 11:33:35 +0000
+++ configure.ac	2010-05-22 13:06:31 +0000
@@ -179,11 +179,13 @@
   AC_MSG_ERROR([bison is not found])
 fi
 
-for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
-  if test -e $file ; then
-    AC_SUBST([FONT_SOURCE], [$file])
-    break
-  fi
+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; do
+    if test -f "$dir/unifont.$ext"; then
+      AC_SUBST([FONT_SOURCE], [$dir/unifont.$ext])
+      break 2
+    fi
+  done
 done
 
 AC_PROG_INSTALL


             reply	other threads:[~2010-05-22 13:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-22 13:17 Grégoire Sutre [this message]
2010-06-07 21:29 ` [Patch] Unifont search in configure.ac Vladimir 'φ-coder/phcoder' Serbinenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BF7D977.1020508@gmail.com \
    --to=gregoire.sutre@gmail.com \
    --cc=grub-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox