Change default set of fonts to include all of /usr/X11R6/lib/X11/fonts (or

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index 71f67421e85d004061d9125fe8ede5b99bdd004f..540abe4c1d57e744c3f6d5f0914995a1102302c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -134,7 +134,7 @@ fontconfig_save_libs="$LIBS"
 fontconfig_save_cflags="$CFLAGS"
 LIBS="$LIBS $FREETYPE_LIBS"
 CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names)
+AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format)
 AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,
                HAVE_FT_BITMAP_SIZE_Y_PPEM=1,
                HAVE_FT_BITMAP_SIZE_Y_PPEM=0,
@@ -281,19 +281,16 @@ yes)
        for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
                case x"$FC_ADD_FONTS" in
                x)
-                       if test -d "$dir/fonts"; then
-                               for sub in "$dir"/fonts/*; do
-                                       if ls "$sub" | grep -q -i '\.pf\|\.tt\|\.ot'; then
-                                               case x$FC_ADD_FONTS in
-                                               x)
-                                                       FC_ADD_FONTS="$sub"
-                                                       ;;
-                                               *)
-                                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
-                                                       ;;
-                                               esac
-                                       fi
-                               done
+                       sub="$dir/fonts"
+                       if test -d "$sub"; then
+                               case x$FC_ADD_FONTS in
+                               x)
+                                       FC_ADD_FONTS="$sub"
+                                       ;;
+                               *)
+                                       FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
+                                       ;;
+                               esac
                        fi
                        ;;
                esac