Bug #387 - usr352@wanadoo.es (Pedro Gimeno)

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index 3badba38495993d9e508f206e9ad698123f13508..75912d9fe2fd872f5295541b3073046d5e77755b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.2.1)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.2)
 
 dnl libtool versioning
 
@@ -225,9 +225,15 @@ AC_ARG_WITH(default-fonts,     [  --with-default-fonts=DIR      Use fonts from D
 
 case "$default_fonts" in
 yes)
-       FC_DEFAULT_FONTS="/usr/share/fonts"
-       AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
-                          [System font directory])
+       if test "$os_win32" = "yes"; then
+               FC_DEFAULT_FONTS="WINDOWSFONTDIR"
+               AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "WINDOWSFONTDIR", 
+                                  [Windows font directory])
+       else
+               FC_DEFAULT_FONTS="/usr/share/fonts"
+               AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
+                                  [System font directory])
+       fi
        ;;
 *)
        FC_DEFAULT_FONTS="$default_fonts"
@@ -320,7 +326,7 @@ AC_SUBST(CONFDIR)
 # Find out what language orthographies are included
 #
 
-ORTH_FILES=`cd fc-lang && echo *.orth`
+ORTH_FILES=`cd ${srcdir}/fc-lang && echo *.orth`
 AC_SUBST(ORTH_FILES)
 
 #