Update to version 2.2.90

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index b02940d1d0aaac3c313af441137f6c9d9adf10ec..3bc3e7e2e9d54ca8b13ed0b3a7faff19a752f7c7 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.1.94)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.90)
 
 dnl libtool versioning
 
@@ -106,8 +106,8 @@ else
        ft_config="$freetype_config"
 fi
 
-FREETYPE_CFLAGS="$($ft_config --cflags)"
-FREETYPE_LIBS="$($ft_config --libs)"
+FREETYPE_CFLAGS="`$ft_config --cflags`"
+FREETYPE_LIBS="`$ft_config --libs`"
 
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
@@ -190,22 +190,22 @@ 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
-       CPPFLAGS="$saved_CPPFLAGS"
-       LIBS="$saved_LIBS"
+       CPPFLAGS="$expatsaved_CPPFLAGS"
+       LIBS="$expatsaved_LIBS"
        ;;
 esac
 AC_SUBST(EXPAT_LIBS)
@@ -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
 
@@ -357,10 +357,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