Update to version 2.2.92

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index b02940d1d0aaac3c313af441137f6c9d9adf10ec..275ff4ca7cd48896e0b8315d6dabc559db7e3393 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.92)
 
 dnl libtool versioning
 
@@ -106,19 +106,23 @@ 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)
 
 #
-# Check to see whether we have FT_Get_First_Char(), new in 2.0.9
+# Check to see whether we have:
+#  FT_Get_Next_Char
+#  FT_Get_BDF_Property
+#  FT_Get_PS_Font_Info
+#  FT_Has_PS_Glyph_Names
 #
 
 fontconfig_save_libs=$LIBS
 LIBS="$LIBS $FREETYPE_LIBS"
-AC_CHECK_FUNCS(FT_Get_First_Char)
+AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names)
 LIBS=$fontconfig_save_libs
 
 #
@@ -190,22 +194,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 +217,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 +229,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 +330,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)
 
 #
@@ -329,16 +339,42 @@ AC_SUBST(ORTH_FILES)
 
 AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
 
-AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=yes)
+AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
 
-if test "x$enable_docs" = xyes; then
-  if test "x$HASDOCBOOK" != xyes; then
-    enable_docs=no
-  fi
+default_docs="yes"
+#
+# Check if docs exist or can be created
+#
+if test x$HASDOCBOOK = xno; then
+       if test -f doc/fonts-conf.5; then
+               :
+       else
+               default_docs="no"
+       fi
 fi
 
+AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=$default_docs)
+
 AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
 
+if test "x$enable_docs" = xyes; then
+       DOCSRC="doc"
+       tmp=funcs.$$
+       cat $srcdir/doc/*.fncs | awk '
+       /^@TITLE@/      { if (!done) { printf ("%s\n", $2); done = 1; } }
+       /^@FUNC@/       { if (!done) { printf ("%s\n", $2); done = 1; } }
+       /^@@/           { done = 0; }' > $tmp
+       DOCMAN3=`cat $tmp | awk '{ printf ("%s.3 ", $1); }'`
+       echo DOCMAN3 $DOCMAN3
+       rm -f $tmp
+else
+       DOCSRC=""
+       DOCMAN3=""
+fi
+
+AC_SUBST(DOCSRC)
+AC_SUBST(DOCMAN3)
+
 #
 # Figure out where to install documentation
 #
@@ -357,10 +393,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