Commit 877c49de5dea4a580dfee7a695d696a189dac961
2008-05-12T14:25:45
* Use fontconfig to find fonts on the system.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/m4/font.m4 b/m4/font.m4
index 663ecc2..571a8c3 100644
--- a/m4/font.m4
+++ b/m4/font.m4
@@ -9,28 +9,35 @@ dnl
AC_DEFUN([FTGL_CHECK_FONT],
[dnl
AC_MSG_CHECKING(for a TrueType font on the system)
-FONT_FILE=no
-for font in \
- DejaVuSerif.ttf VeraSe.ttf DejaVuSans.ttf Vera.ttf \
- times.ttf Times.ttf arial.ttf Arial.ttf; do
- for dir in \
- /usr/share/fonts \
- /usr/share/fonts/truetype \
- /usr/share/fonts/truetype/ttf-dejavu \
- /usr/share/fonts/truetype/ttf-bitstream-vera \
- /usr/share/fonts/TTF \
- /usr/share/fonts/TTF/dejavu \
- /usr/share/fonts/dejavu \
- /usr/share/fonts/ttf-dejavu \
- /usr/share/fonts/ttf-bitstream-vera \
- /usr/X11R6/lib/X11/fonts \
- /usr/X11R6/lib/X11/fonts/TTF; do
- if test -f "$dir/$font"; then FONT_FILE="$dir/$font"; break; fi
+
+dnl First try: fontconfig
+FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*\<file:@<:@^"@:>@*"\(@<:@^"@:>@*\)".*/\1/p;tx;d;:x q'`"
+
+dnl Second try: look into known paths
+if test "$FONT_FILE" = ""; then
+ for font in \
+ DejaVuSerif.ttf VeraSe.ttf DejaVuSans.ttf Vera.ttf \
+ times.ttf Times.ttf arial.ttf Arial.ttf; do
+ for dir in \
+ /usr/share/fonts \
+ /usr/share/fonts/truetype \
+ /usr/share/fonts/truetype/ttf-dejavu \
+ /usr/share/fonts/truetype/ttf-bitstream-vera \
+ /usr/share/fonts/TTF \
+ /usr/share/fonts/TTF/dejavu \
+ /usr/share/fonts/dejavu \
+ /usr/share/fonts/ttf-dejavu \
+ /usr/share/fonts/ttf-bitstream-vera \
+ /usr/X11R6/lib/X11/fonts \
+ /usr/X11R6/lib/X11/fonts/TTF; do
+ if test -f "$dir/$font"; then FONT_FILE="$dir/$font"; break; fi
+ done
+ if test "$FONT_FILE" != no; then break; fi
done
- if test "$FONT_FILE" != no; then
- AC_DEFINE_UNQUOTED(FONT_FILE, "$FONT_FILE", [Define to the path to a TrueType font])
- break
- fi
-done
+fi
+
+if test "$FONT_FILE" != ""; then
+ AC_DEFINE_UNQUOTED(FONT_FILE, "$FONT_FILE", [Define to the path to a TrueType font])
+fi
AC_MSG_RESULT($FONT_FILE)
])