=== 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=