Add share/doc directory. Add Fc*.3 man pages.

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index 3453bae131ebf4bb8e3bb9cf015809f5d7653db4..76e8d44ebc651e900c1d4887d5dd516f7c2a126d 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.0)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.90)
 
 dnl libtool versioning
 
@@ -190,17 +190,17 @@ no)
                expat=no
                ;;
        yes)
-               AC_CHECK_FUNCS(XML_ParserCreate)
-               case "$ac_cv_func_XML_ParserCreate" in
-               no)
-                       expat=no
-                       ;;
+               AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
+               case "$ac_cv_func_XML_SetDoctypeDeclHandler" in
                yes)
                        HAVE_EXPAT=1
                        AC_SUBST(HAVE_EXPAT)
                        AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
                        [Found a useable expat library])
                        ;;
+               *)
+                       expat=no
+                       ;;
                esac
                ;;
        esac
@@ -213,7 +213,7 @@ AC_SUBST(EXPAT_CFLAGS)
        
 case "$expat" in
 no)
-       AC_MSG_ERROR([cannot find expat library])
+       AC_MSG_ERROR([Cannot find usable expat library. This could mean that your version is too old.])
        ;;
 esac
 
@@ -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"
@@ -357,10 +363,12 @@ AC_OUTPUT([
 Makefile 
 fontconfig/Makefile
 fc-lang/Makefile
+fc-glyphname/Makefile
 src/Makefile
 src/fontconfig.def
 fc-cache/Makefile
 fc-list/Makefile
+fc-match/Makefile
 doc/Makefile
 doc/version.sgml
 test/Makefile