From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OFoaZ-0006j2-Ra for mharc-grub-devel@gnu.org; Sat, 22 May 2010 09:18:03 -0400 Received: from [140.186.70.92] (port=48133 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFoaW-0006gO-GC for grub-devel@gnu.org; Sat, 22 May 2010 09:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFoaU-0004D6-SL for grub-devel@gnu.org; Sat, 22 May 2010 09:18:00 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:58013) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFoaU-0004Ch-NN for grub-devel@gnu.org; Sat, 22 May 2010 09:17:58 -0400 Received: by wyf22 with SMTP id 22so402148wyf.0 for ; Sat, 22 May 2010 06:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type; bh=d9/xpjVegpUjx+5kBAqm2PxM/Dpr62pbBSQP3+V1hOc=; b=oS+fmuZhad8KR/p9OhuOwOGTeM4Vf2wz/lfA/dW5Cu7HxSOWKDChzVYEx7JvcpSQMs l6hJ0uXmxQGcVpc9W87QY6amNjm9rTzkkAs2YqSH/Q5XcFxL8Xj/f32lD8FaSkfkzXER c2M9Wb9F7Ihtt8b+xWNRQWwLOHZ2QtyCo/yPg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; b=Ntck/msGTZmCOFDslxIbFtpZCshhwO2a3tVJkGbQT5p2M5iyTItPayRRV39N4IREzb 1tfQu/GILUBvh2izQPXToyfHODaE9xGM3OKRmBRo6njmWlR5raFXOQZ7z0h00Oe1McuH zNucCrWyk0s0Aai6J9xqD7OUsbWEZWw1ErDJs= Received: by 10.227.152.76 with SMTP id f12mr2683441wbw.54.1274534277130; Sat, 22 May 2010 06:17:57 -0700 (PDT) Received: from [192.168.1.50] (c2433-1-88-160-112-182.fbx.proxad.net [88.160.112.182]) by mx.google.com with ESMTPS id u36sm15410356wbv.12.2010.05.22.06.17.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 06:17:56 -0700 (PDT) Message-ID: <4BF7D977.1020508@gmail.com> Date: Sat, 22 May 2010 15:17:43 +0200 From: =?ISO-8859-1?Q?Gr=E9goire_Sutre?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100411 Icedove/3.0.4 MIME-Version: 1.0 To: The development of GNU GRUB Content-Type: multipart/mixed; boundary="------------020208030008060106020607" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Patch] Unifont search in configure.ac X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 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, 22 May 2010 13:18:01 -0000 This is a multi-part message in MIME format. --------------020208030008060106020607 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit 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 --------------020208030008060106020607 Content-Type: text/x-patch; name="unifont-patch.diff" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="unifont-patch.diff" === 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 + + * configure.ac: Add `.' to the directories searched for unifont. + 2010-05-21 Vladimir Serbinenko * 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 --------------020208030008060106020607--