From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1SGD6p-0006J5-Rh for mharc-grub-devel@gnu.org; Fri, 06 Apr 2012 13:38:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGD6l-0006DB-8N for grub-devel@gnu.org; Fri, 06 Apr 2012 13:38:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGD6j-00039O-9t for grub-devel@gnu.org; Fri, 06 Apr 2012 13:37:58 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:64772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGD6j-00039A-2n for grub-devel@gnu.org; Fri, 06 Apr 2012 13:37:57 -0400 Received: by bkwq16 with SMTP id q16so2614555bkw.0 for ; Fri, 06 Apr 2012 10:37:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:x-gm-message-state; bh=f6vL6eEYTKXPTcIg13TDmajN38uMfiZSpcS9gdJDVvY=; b=M84yQnoZMyr80utspFDAIc0YeRVh5//yLwF3ooMYMiArum42cvBJXHxXaEINA6SU0H rB3wjglFZUHhypLB4yOW3vDGhsU7AQ2HGj4jzIoqjE90MhvzKmVZqyxaGOhpKK/QaQGa IxkAJ9pLfugpZx7g2cjxd5lzhLSKjIPMa5QRSaoZty4JejyX6G81Wksp0OcV4rD4vjL2 Xlvh1lXQ/8VOf2WqOTd5ZiPiL467zEfD2BnyLpym5ov0eZyBRzFW6Gd0xrhToaJXnlRP fhZ1FtYahkvv7+l3XO7Ue+Ju8QKfBMX7OYYawcB+4xnAUv8cb64Alzsrc8PJYdAFV8nB 1QMQ== Received: by 10.205.122.144 with SMTP id gg16mr3397193bkc.12.1333733874620; Fri, 06 Apr 2012 10:37:54 -0700 (PDT) Received: from [192.168.2.4] ([77.75.167.238]) by mx.google.com with ESMTPS id gu12sm8251319bkc.1.2012.04.06.10.37.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Apr 2012 10:37:53 -0700 (PDT) Message-ID: <4F7F29EE.8080808@kiilerich.com> Date: Fri, 06 Apr 2012 19:37:50 +0200 From: Mads Kiilerich User-Agent: Mozilla/5.0 (X11; Linux i686; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: The development of GNU GRUB Subject: [PATCH] Make the unifont FONT_SOURCE configurable as --with-unifont=FILE Content-Type: multipart/mixed; boundary="------------030406010806020708090908" X-Gm-Message-State: ALoCoQlV5HfVPMjN/T8qsi+uoWUGpGnM3ie+42IpPZYtlPnHHZCAu+ILmQ46uEHxn61IUvd25SjM X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.41 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: Fri, 06 Apr 2012 17:38:03 -0000 This is a multi-part message in MIME format. --------------030406010806020708090908 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Fonts might be located in different locations, and the default fonts (Unifont and DejaVu Sans) are not available on all systems or other fonts might be preferred. 2012-04-06 Mads Kiilerich * configure.ac: Make the unifont FONT_SOURCE configurable as --with-unifont=FILE --------------030406010806020708090908 Content-Type: text/x-patch; name="grub-configure-unifont.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="grub-configure-unifont.patch" === modified file 'configure.ac' --- configure.ac 2012-04-01 19:54:45 +0000 +++ configure.ac 2012-04-06 17:21:55 +0000 @@ -238,16 +238,23 @@ AC_MSG_ERROR([bison is not found]) fi -FONT_SOURCE= +AC_ARG_WITH([unifont], + AS_HELP_STRING([--with-unifont=FILE], + [set the unifont source [[guessed]]])) -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 - FONT_SOURCE="$dir/unifont.$ext" - break 2 - fi +if test "x$with_unifont" = x; then + 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; do + if test -f "$dir/unifont.$ext"; then + FONT_SOURCE="$dir/unifont.$ext" + break 2 + fi + done done -done +else + FONT_SOURCE="$with_unifont" +fi if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips); then AC_MSG_ERROR([qemu and loongson ports need unifont]) @@ -930,7 +937,7 @@ AC_SUBST([freetype_cflags]) AC_SUBST([freetype_libs]) -DJVU_FONT_SOURCE= +DJVU_FONT_SOURCE="$FONT_SOURCE" starfield_excuse= --------------030406010806020708090908--