=== modified file 'ChangeLog' --- ChangeLog 2010-06-03 22:02:54 +0000 +++ ChangeLog 2010-06-03 22:06:21 +0000 @@ -1,5 +1,9 @@ 2010-06-03 Grégoire Sutre + * configure.ac: Add `.' to the directories searched for unifont. + +2010-06-03 Grégoire Sutre + * util/grub-install.in: Use -x instead of -f when checking for grub programs, and factorize these checks by a for loop. * util/grub-mkconfig.in: Likewise. === modified file 'configure.ac' --- configure.ac 2010-06-03 21:36:19 +0000 +++ configure.ac 2010-06-03 22:06:21 +0000 @@ -179,11 +179,13 @@ if test "x$YACC" = x; then 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