Add . to the directories searched for unifont.

ChangeLog

@@ -1,3 +1,7 @@
+2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Add `.' to the directories searched for unifont.
+
 2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add ascii.bitmaps, ascii.h, grub_script.yy.c, and

configure.ac

@@ -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
+for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
-  if test -e $file ; then
+  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
-    AC_SUBST([FONT_SOURCE], [$file])
+    if test -f "$dir/unifont.$ext"; then
-    break
+      AC_SUBST([FONT_SOURCE], [$dir/unifont.$ext])
-  fi
+      break 2
+    fi
+  done
 done
 
 AC_PROG_INSTALL